diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
| commit | 3beb56bde63d1a10abc02ffe76c1f98d59ec0874 (patch) | |
| tree | 69a2fa30848725866acfc359799bbfab5a2ce1d7 /t/t3900-i18n-commit.sh | |
| parent | 2fe18392f0355c80295b8b74b24fc817183d3752 (diff) | |
| parent | b3fde6ccb1cbdd362dec19e317905f71528b3a53 (diff) | |
| download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz | |
Merge branch 'jc/diff-no-no-index'
* jc/diff-no-no-index:
git diff --no-index: default to page like other diff frontends
git-diff: allow --no-index semantics a bit more
"git diff": do not ignore index without --no-index
diff-files: do not play --no-index games
tests: do not use implicit "git diff --no-index"
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 94b1c24b0a..883281dbd6 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/^ //' >current && - git diff current "$2" + test_cmp current "$2" } test_expect_success setup ' |