diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:52 -0700 |
| commit | f9891802624a99b84e5504cb166ee9ffcb6d976d (patch) | |
| tree | e12f23b0331bfc03f28c85aa3d0916f43a925d3a /git-merge-octopus.sh | |
| parent | Merge branch 'tr/gitk-doc-update' (diff) | |
| parent | Revert "test-lib: allow prefixing a custom string before "ok N" etc." (diff) | |
| download | tgif-f9891802624a99b84e5504cb166ee9ffcb6d976d.tar.xz | |
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"
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions