difftool: fallback on merge.guitool

diff --git a/t/t2103-update-index-ignore-missing.sh b/t/t2103-update-index-ignore-missing.sh
index 332694e7d38083fad18b3e53e4def268d54e9423..0114f052280d4022a3b47e427b2da3df5547f24c 100755 (executable)
--- a/t/t2103-update-index-ignore-missing.sh
+++ b/t/t2103-update-index-ignore-missing.sh
@@ -32,7 +32,7 @@ test_expect_success basics '
                test_create_repo xyzzy &&
                cd xyzzy &&
                >file &&
-               git add file
+               git add file &&
                git commit -m "sub initial"
        ) &&
        git add xyzzy &&