diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-19 00:12:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-19 00:12:15 +0100 |
| commit | c7f352f31ad0593f7772a155980b16cbbaac3dec (patch) | |
| tree | c64eb97b8d3846244a534e36ba89093c070da124 /t/t7610-mergetool.sh | |
| parent | Merge branch 'bw/pathspec-cleanup' (diff) | |
| parent | t9813: avoid using pipes (diff) | |
| download | git-c7f352f31ad0593f7772a155980b16cbbaac3dec.tar.xz git-c7f352f31ad0593f7772a155980b16cbbaac3dec.zip | |
Merge branch 'pb/test-must-fail-is-for-git'
Test cleanup.
* pb/test-must-fail-is-for-git:
t9813: avoid using pipes
don't use test_must_fail with grep
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 63d36fb28e..0fe7e58cfb 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -602,7 +602,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT test_config mergetool.myecho.trustExitCode true && test_must_fail git merge master && git mergetool --no-prompt --tool myecho -- both >actual && - test_must_fail grep ^\./both_LOCAL_ actual >/dev/null && + ! grep ^\./both_LOCAL_ actual >/dev/null && grep /both_LOCAL_ actual >/dev/null && git reset --hard master >/dev/null 2>&1 ' |