diff options
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/lib')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java index 929753ab14..f06b37c842 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java @@ -467,15 +467,15 @@ public class DirCacheCheckoutTest extends RepositoryTestCase { *8 F D F N Y N N Conflict *9 F D F Y N N N Update *10 F D D N N Y Keep - *11 F D D N N N Conflict - *12 F F D Y N Y N Update - *13 F F D N N Y N Conflict - *14 F F D N N N Conflict - *15 0 F D N N N Conflict - *16 0 D F Y N N N Update - *17 0 D F N N N Conflict - *18 F 0 D Update - *19 D 0 F Update + *11 F D D N N N Conflict + *12 F F D Y N Y N Update + *13 F F D N N Y N Conflict + *14 F F D N N N Conflict + *15 0 F D N N N Conflict + *16 0 D F Y N N N Update + *17 0 D F N N N Conflict + *18 F 0 D Update + *19 D 0 F Update */ @Test public void testDirectoryFileSimple() throws IOException { |