contrib: add 'git difftool' for launching common merge tools

diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index 9beaecd18b25cb7e22b09c11234c05a8fa1d4116..6ef2dcfd8afece86aaf6345630179af179eb2ed9 100755 (executable)
--- a/t/t2100-update-cache-badpath.sh
+++ b/t/t2100-update-cache-badpath.sh
@@ -46,6 +46,6 @@ for p in path0/file0 path1/file1 path2 path3
 do
        test_expect_success \
            "git update-index to add conflicting path $p should fail." \
-           "! git update-index --add -- $p"
+           "test_must_fail git update-index --add -- $p"
 done
 test_done