summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2020-04-20 04:54:44 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-20 13:30:11 -0700
commitbf1218106835fb06f8862c6727dd4453e9ea5fd9 (patch)
tree3557e9f783f39946f53adb6b5db5dbf5d21494fa /Documentation/git-merge-one-file.txt
parentt9160: use test_path_is_missing() (diff)
downloadtgif-bf1218106835fb06f8862c6727dd4453e9ea5fd9.tar.xz
t9164: use test_must_fail only on git commands
The `test_must_fail` function should only be used for git commands; we are not in the business of catching segmentation fault by external commands. Shell helper functions test_cmp and svn_cmd used in this script are wrappers around external commands, so just use `! cmd` instead of `test_must_fail cmd` Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions