diff options
| author | Axel Richard <axel.richard@obeo.fr> | 2013-11-28 14:14:32 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-12-02 22:55:55 +0100 |
| commit | 1128326adde8f2c98bddc58ce1879fca7b2cd41f (patch) | |
| tree | c78c3fab2dd41a0974589d0b807aed8c08fa91e2 /org.eclipse.jgit | |
| parent | 99608f0b9a10abe0f8426f0ff5bc51eb6a2ae866 (diff) | |
| download | jgit-1128326adde8f2c98bddc58ce1879fca7b2cd41f.tar.gz jgit-1128326adde8f2c98bddc58ce1879fca7b2cd41f.zip | |
Add pgm test for checkout of existing branch with checkout conflict
Add a test that checks out an existing branch with a dirty working tree
and involves a checkout conflict. This test should pass with a message:
"error: Your local changes to the following files would be overwritten
by checkout: a".
Change-Id: I5428a04a7630d9e0101404ea1aedd796f127bd7d
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
0 files changed, 0 insertions, 0 deletions