diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-03-30 22:04:53 +0200 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-05-17 19:06:07 +0200 |
| commit | 1a9f12277313c12830b24b63559bb31eb584b241 (patch) | |
| tree | 187a41becf20f28152805872115536a173e9d87e /org.eclipse.jgit.ui/resources/org/eclipse | |
| parent | f7ac527ca7a5ab1d0b1a7027c50483849bf39308 (diff) | |
| download | jgit-1a9f12277313c12830b24b63559bb31eb584b241.tar.gz jgit-1a9f12277313c12830b24b63559bb31eb584b241.zip | |
Fix a number of failing conflict situations
Adds further tests where the working tree is dirty (differs from
index) and where we have staged but uncommitted changes.
Fixed the test case 9 for file/directory conflicts.
Bug: 428819
Change-Id: Ie44a288b052abe936ebb74272d0fefef3b218a7a
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit.ui/resources/org/eclipse')
0 files changed, 0 insertions, 0 deletions