Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Accept dates before 2000/01/01 when specified as seconds since the epoch
[gitweb.git]
/
t
/
t5515-fetch-merge-logic.sh
diff --git
a/t/t5515-fetch-merge-logic.sh
b/t/t5515-fetch-merge-logic.sh
index 0b600bb429b69df02d971913e4b658bf7e313277..6c9cc67508f4351f5627b613215e6b88b0adc49a 100755
(executable)
--- a/
t/t5515-fetch-merge-logic.sh
+++ b/
t/t5515-fetch-merge-logic.sh
@@
-149,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.