diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
| commit | cf6981d4932007555689052cbc255b911674b01c (patch) | |
| tree | 780cfe523171d98ecded8e4d8509db507707e1f3 /t/t4006-diff-mode.sh | |
| parent | Merge branch 'jc/fsck' (diff) | |
| parent | Get rid of the dependency to GNU diff in the tests (diff) | |
| download | tgif-cf6981d4932007555689052cbc255b911674b01c.tar.xz | |
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/t4006-diff-mode.sh')
| -rwxr-xr-x | t/t4006-diff-mode.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index ca342f48a1..e72c6fd1b4 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -38,7 +38,7 @@ echo ":100644 100755 X X M rezrov" >expected test_expect_success \ 'verify' \ - 'diff -u expected check' + 'git diff expected check' test_done |