diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:51:24 -0700 |
commit | 09b90fb3c065ac5ac2ad051596b036131ecedbd5 (patch) | |
tree | 687a072364d6ac26ce8459416341b8fc5db9364b /t/t7611-merge-abort.sh | |
parent | Merge branch 'jc/diff-algo-cleanup' (diff) | |
parent | diffstat summary line varies by locale: miscellany (diff) | |
download | tgif-09b90fb3c065ac5ac2ad051596b036131ecedbd5.tar.xz |
Merge branch 'jn/diffstat-tests'
Some tests checked the "diff --stat" output when they do not have to,
which unnecessarily made things harder to verify under GETTEXT_POISON.
By Jonathan Nieder
* jn/diffstat-tests:
diffstat summary line varies by locale: miscellany
test: use numstat instead of diffstat in binary-diff test
test: use --numstat instead of --stat in "git stash show" tests
test: test cherry-pick functionality and output separately
test: modernize funny-names test style
test: use numstat instead of diffstat in funny-names test
test: use test_i18ncmp when checking --stat output
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions