diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:17:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:17:23 -0700 |
| commit | 0ba92ef3386a360442e0403b6655384c2d62557f (patch) | |
| tree | d1242ed1c5531dcdc53002fba703a413d27eb492 /merge.c | |
| parent | Merge branch 'sb/merge-recursive-copy-paste-fix' (diff) | |
| parent | tests: drop GIT_*_TIMING_TESTS environment variable support (diff) | |
| download | tgif-0ba92ef3386a360442e0403b6655384c2d62557f.tar.xz | |
Merge branch 'jc/test-lazy-prereq'
Test-script clean-up.
* jc/test-lazy-prereq:
tests: drop GIT_*_TIMING_TESTS environment variable support
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions