Merge branch 'hv/submodule-find-ff-merge'

diff --git a/t/t7111-reset-table.sh b/t/t7111-reset-table.sh
index 0a362a12bfa9d93492ed9f6a29942de4dcc4b9e7..ce421ad5ac4b3a17d0e347a7d86a386e2b14547b 100755 (executable)
--- a/t/t7111-reset-table.sh
+++ b/t/t7111-reset-table.sh
@@ -44,26 +44,32 @@ A B C D soft   A B D
 A B C D mixed  A D D
 A B C D hard   D D D
 A B C D merge  XXXXX
+A B C D keep   XXXXX
 A B C C soft   A B C
 A B C C mixed  A C C
 A B C C hard   C C C
 A B C C merge  XXXXX
+A B C C keep   A C C
 B B C D soft   B B D
 B B C D mixed  B D D
 B B C D hard   D D D
 B B C D merge  D D D
+B B C D keep   XXXXX
 B B C C soft   B B C
 B B C C mixed  B C C
 B B C C hard   C C C
 B B C C merge  C C C
+B B C C keep   B C C
 B C C D soft   B C D
 B C C D mixed  B D D
 B C C D hard   D D D
 B C C D merge  XXXXX
+B C C D keep   XXXXX
 B C C C soft   B C C
 B C C C mixed  B C C
 B C C C hard   C C C
 B C C C merge  B C C
+B C C C keep   B C C
 EOF
 
 test_expect_success 'setting up branches to test with unmerged entries' '
@@ -73,13 +79,13 @@ test_expect_success 'setting up branches to test with unmerged entries' '
     git checkout branch1 &&
     test_commit B1 file1 &&
     git checkout branch2 &&
-    test_commit B2 file1
+    test_commit B file1
 '
 
 while read W1 I1 H1 T opt W2 I2 H2
 do
     test_expect_success "check: $W1 $I1 $H1 $T --$opt $W2 $I2 $H2" '
-       git reset --hard B2 &&
+       git reset --hard B &&
        test_must_fail git merge branch1 &&
        cat file1 >X_file1 &&
        if test "$W2" != "XXXXX"
@@ -100,14 +106,16 @@ do
        fi
     '
 done <<\EOF
-X U C D soft   XXXXX
-X U C D mixed  X D D
-X U C D hard   D D D
-X U C D merge  D D D
-X U C C soft   XXXXX
-X U C C mixed  X C C
-X U C C hard   C C C
-X U C C merge  C C C
+X U B C soft   XXXXX
+X U B C mixed  X C C
+X U B C hard   C C C
+X U B C merge  C C C
+X U B C keep   XXXXX
+X U B B soft   XXXXX
+X U B B mixed  X B B
+X U B B hard   B B B
+X U B B merge  B B B
+X U B B keep   XXXXX
 EOF
 
 test_done