Merge branch 'jn/diffstat-tests'
commit09b90fb3c065ac5ac2ad051596b036131ecedbd5
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:24 +0000 (15 22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:24 +0000 (15 22:51 -0700)
tree687a072364d6ac26ce8459416341b8fc5db9364b
parent86c340e08287c0faad8871207787e5819f22a7d5
parent6dd88832e77ad7c0c7f82522d3741b5b7bf62fbd
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