unpack-trees: oneway_merge to update submodules

diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 0d5b42a25bbe79d3fb7b09ce4bf5107ee55928e5..7bfb2f498d3579d6e0aed2056a996f5c2829e8e4 100755 (executable)
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -119,7 +119,7 @@ test_expect_success 'merge with one side as a fast-forward of the other' '
         git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
         (cd sub &&
          git rev-parse sub-d > ../expect) &&
-        test_cmp actual expect)
+        test_cmp expect actual)
 '
 
 test_expect_success 'merging should conflict for non fast-forward' '