diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-11 10:26:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 10:26:33 +0300 |
| commit | cf6981d4932007555689052cbc255b911674b01c (patch) | |
| tree | 780cfe523171d98ecded8e4d8509db507707e1f3 /t/t5515-fetch-merge-logic.sh | |
| parent | 8509fed75d576023f5f2db8542fad102fcc62d4d (diff) | |
| parent | 5bd74506cd30e897d1493639b7438c6cc80dea8e (diff) | |
Merge branch 'js/diff-ni'
* js/diff-ni:
Get rid of the dependency to GNU diff in the tests
diff --no-index: support /dev/null as filename
diff-ni: fix the diff with standard input
diff: support reading a file from stdin via "-"
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 0b600bb429..6c9cc67508 100755 --- 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. |