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

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index aac212e936331db9a596fda0c4a9c0382e123797..ba9060190d31f0b57a461c114e1c856523845f78 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -53,7 +53,7 @@ test_expect_success 'checkout' '
        (
                cd test && git checkout b1
        ) >actual &&
-       grep -e "have 1 and 1 different" actual
+       grep "have 1 and 1 different" actual
 '
 
 test_expect_success 'status' '
@@ -63,7 +63,7 @@ test_expect_success 'status' '
                # reports nothing to commit
                test_must_fail git status
        ) >actual &&
-       grep -e "have 1 and 1 different" actual
+       grep "have 1 and 1 different" actual
 '