Merge branch 'jc/grep-c'

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 765c83fda7d91f66456fc2dc2299867059a66971..6c9cc67508f4351f5627b613215e6b88b0adc49a 100755 (executable)
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -114,6 +114,7 @@ done >> tests
 # neither in the Pull: or .fetch config
 for branch in master br-unconfig ; do
     cat <<EOF
+$branch ../.git
 $branch ../.git one
 $branch ../.git one two
 $branch --tags ../.git
@@ -148,7 +149,7 @@ do
                } >"$actual" &&
                if test -f "$expect"
                then
-                       diff -u "$expect" "$actual" &&
+                       git diff -u "$expect" "$actual" &&
                        rm -f "$actual"
                else
                        # this is to help developing new tests.