summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-06-15 07:53:19 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-06-17 11:12:32 -0700
commit6b7093064a8db318bb18272a064590d558998dbf (patch)
tree2ad2d5064f44e9596a4577a64d05eb0539b96e88 /git-mergetool.sh
parentt3200: rename "expected" to "expect" (diff)
downloadtgif-6b7093064a8db318bb18272a064590d558998dbf.tar.xz
t3200: test for specific errors
In the "--set-upstream-to" and "--unset-upstream" tests, specific error conditions are being tested. However, there is no way of ensuring that a test case is failing because of some specific error. Check stderr of failing commands to ensure that they are failing in the expected way. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions