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

diff --git a/t/t7111-reset-table.sh b/t/t7111-reset-table.sh
index 2ebda97828a83e849528b303ca4cda6f1ef84a40..ce421ad5ac4b3a17d0e347a7d86a386e2b14547b 100755 (executable)
--- a/t/t7111-reset-table.sh
+++ b/t/t7111-reset-table.sh
@@ -115,7 +115,7 @@ 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   X B B
+X U B B keep   XXXXX
 EOF
 
 test_done