Merge branch 'tr/valgrind-test-fix'
commitf9891802624a99b84e5504cb166ee9ffcb6d976d
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:52 +0000 (30 12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:52 +0000 (30 12:10 -0700)
treee12f23b0331bfc03f28c85aa3d0916f43a925d3a
parent0040d6eb23001531a6defc7f0fc15a2a7eb23baf
parent633fe50ab7d718dc92b3f3e988296a9aa501af78
Merge branch 'tr/valgrind-test-fix'

* tr/valgrind-test-fix:
  Revert "test-lib: allow prefixing a custom string before "ok N" etc."
  Revert "test-lib: support running tests under valgrind in parallel"
t/test-lib.sh