Merge branch 'jn/diffstat-tests' into next
commit8791b2fc08b718a06a9a9a233ed9ab38fd9acf16
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:56 +0000 (20 15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2012 22:54:56 +0000 (20 15:54 -0700)
treee2cd762d9095c73614757a86f82dfb7158cbb9c8
parent0ada7d4c3102451f260da54008af2067050e14bd
parent6dd88832e77ad7c0c7f82522d3741b5b7bf62fbd
Merge branch 'jn/diffstat-tests' into next

Some tests checked the "diff --stat" output when they do not have to,
which unnecessarily made things harder to verify under GETTEXT_POISON.

Not urgent.

* 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