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/t3900-i18n-commit.sh | |
| parent | 8509fed75d576023f5f2db8542fad102fcc62d4d (diff) | |
| parent | 5bd74506cd30e897d1493639b7438c6cc80dea8e (diff) | |
| download | git-cf6981d4932007555689052cbc255b911674b01c.tar.gz git-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/t3900-i18n-commit.sh')
| -rwxr-xr-x | t/t3900-i18n-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh index e54fe0f40..ffddb68db 100755 --- a/t/t3900-i18n-commit.sh +++ b/t/t3900-i18n-commit.sh @@ -9,7 +9,7 @@ test_description='commit and log output encodings' compare_with () { git-show -s $1 | sed -e '1,/^$/d' -e 's/^ //' -e '$d' >current && - diff -u current "$2" + git diff current "$2" } test_expect_success setup ' |