revision: implement sparse algorithm

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 59e52c5a09eebfabe932c5c33a842236f68ffdfb..e1cef58f2af96f6185ed93086c3966fb73d58f79 100755 (executable)
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -230,13 +230,13 @@ test_expect_success 'git detects differently handled merges conflict' '
                        :2:new_a :3:new_a &&
                test_cmp expect actual &&
 
-               git cat-file -p B:new_a >ours &&
-               git cat-file -p C:new_a >theirs &&
+               git cat-file -p C:new_a >ours &&
+               git cat-file -p B:new_a >theirs &&
                >empty &&
                test_must_fail git merge-file \
-                       -L "Temporary merge branch 2" \
-                       -L "" \
                        -L "Temporary merge branch 1" \
+                       -L "" \
+                       -L "Temporary merge branch 2" \
                        ours empty theirs &&
                sed -e "s/^\([<=>]\)/\1\1\1/" ours >expect &&
                git cat-file -p :1:new_a >actual &&