From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Oct 2013 19:10:52 +0000 (-0700)
Subject: Merge branch 'tr/valgrind-test-fix'
X-Git-Tag: v1.8.5-rc0~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9891802624a99b84e5504cb166ee9ffcb6d976d;p=thirdparty%2Fgit.git

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"
---

f9891802624a99b84e5504cb166ee9ffcb6d976d