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/t7610-mergetool.sh | |
| parent | 217f2767cbcb562872437eed4dec62e00846d90c (diff) | |
| download | git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.gz git-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/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 381b7df45..1a430b9c4 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -621,7 +621,7 @@ test_expect_success 'file with no base' ' test_must_fail git merge master && git mergetool --no-prompt --tool mybase -- both && >expected && - test_cmp both expected + test_cmp expected both ' test_expect_success 'custom commands override built-ins' ' @@ -632,7 +632,7 @@ test_expect_success 'custom commands override built-ins' ' test_must_fail git merge master && git mergetool --no-prompt --tool defaults -- both && echo master both added >expected && - test_cmp both expected + test_cmp expected both ' test_expect_success 'filenames seen by tools start with ./' ' |