diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:33:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:33:48 +0300 |
| commit | 14677d25ab50efcf57621ae69d6ba858a5f86165 (patch) | |
| tree | c480f4a1ac902ab01d430b00e3dfbd2093b30d7a /t/t7610-mergetool.sh | |
| parent | 34f229790dcc7c7dc61bc37532f88fca39e36de2 (diff) | |
| parent | d3c6751b18170276f80e3578d16877d43ad22709 (diff) | |
Merge branch 'ab/test-must-be-empty-for-master'
Test updates.
* ab/test-must-be-empty-for-master:
tests: make use of the test_must_be_empty function
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 047156e9d5..b18503de81 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -620,8 +620,7 @@ test_expect_success 'file with no base' ' git checkout -b test$test_count branch1 && test_must_fail git merge master && git mergetool --no-prompt --tool mybase -- both && - >expected && - test_cmp expected both + test_must_be_empty both ' test_expect_success 'custom commands override built-ins' ' |