Merge branch 'jt/commit-graph-per-object-store'

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 047156e9d51141a97ad71687c6da036b5ce76548..b18503de8158aa6583423f923675d415ab408e76 100755 (executable)
--- 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' '