difftool: fallback on merge.guitool

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 314c73c5a708fda8f39e7a86bf3db0329191d7a7..f764b7e3f53e95e11acd4c2bdaafb737979d45e2 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -88,9 +88,8 @@ test_expect_success 'non-qualified update in subdir updates from the root' '
                echo even more >>sub2 &&
                git add -u
        ) &&
-       : >expect &&
        git diff-files --name-only >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'replace a file with a symlink' '