summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
diff options
context:
space:
mode:
authorMatthew DeVore <matvore@google.com>2018-10-05 14:54:04 -0700
committerJunio C Hamano <gitster@pobox.com>2018-10-07 08:51:18 +0900
commitdcbaa0b361f5bebcbe6eca446819fadd02083461 (patch)
tree5424e437cc8b6a0665061a4dc4686200ff35f894 /t/t6027-merge-binary.sh
parentbdbc17e86abe2471c4bd0d52cdc004835cb7bb3e (diff)
t/*: fix ordering of expected/observed arguments
Fix various places where the ordering was obviously wrong, meaning it was easy to find with grep. Signed-off-by: Matthew DeVore <matvore@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6027-merge-binary.sh')
-rwxr-xr-xt/t6027-merge-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh
index 07735410b9..4e6c7cb77e 100755
--- a/t/t6027-merge-binary.sh
+++ b/t/t6027-merge-binary.sh
@@ -45,7 +45,7 @@ test_expect_success resolve '
false
else
git ls-files -s >current
- test_cmp current expect
+ test_cmp expect current
fi
'
@@ -60,7 +60,7 @@ test_expect_success recursive '
false
else
git ls-files -s >current
- test_cmp current expect
+ test_cmp expect current
fi
'