diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-10-06 12:00:06 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-07 10:56:08 +0900 |
| commit | 9c5b2fab304b5ce3233401c7c7e7a123d551c484 (patch) | |
| tree | e53aea6a3b052ed63bd417d6019bf273439f5d7f /t/t7201-co.sh | |
| parent | Git 2.15-rc0 (diff) | |
| download | tgif-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.xz | |
tests: fix diff order arguments in test_cmp
Fix the argument order for test_cmp. When given the expected
result first the diff shows the actual output with '+' and the
expectation with '-', which is the convention for our tests.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7201-co.sh')
| -rwxr-xr-x | t/t7201-co.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh index d4b217b0ee..76c223c967 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -187,7 +187,7 @@ test_expect_success 'format of merge conflict from checkout -m' ' d >>>>>>> local EOF - test_cmp two expect + test_cmp expect two ' test_expect_success 'checkout --merge --conflict=diff3 <branch>' ' @@ -213,7 +213,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' ' d >>>>>>> local EOF - test_cmp two expect + test_cmp expect two ' test_expect_success 'switch to another branch while carrying a deletion' ' |