summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-10-06 12:00:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-07 10:56:08 +0900
commit9c5b2fab304b5ce3233401c7c7e7a123d551c484 (patch)
treee53aea6a3b052ed63bd417d6019bf273439f5d7f /git-merge-one-file.sh
parentGit 2.15-rc0 (diff)
downloadtgif-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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions