diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:42:00 -0700 |
| commit | ce6ab232cae58d78d26edabc12e038e6b1959796 (patch) | |
| tree | 2583a9bdd4d1d34444142203b8392b894bba37ea /builtin/merge-index.c | |
| parent | Merge branch 'lm/squelch-bg-progress' (diff) | |
| parent | subdirectory tests: code cleanup, uncomment test (diff) | |
| download | tgif-ce6ab232cae58d78d26edabc12e038e6b1959796.tar.xz | |
Merge branch 'sb/t1020-cleanup'
There was a commented-out (instead of being marked to expect
failure) test that documented a breakage that was fixed since the
test was written; turn it into a proper test.
* sb/t1020-cleanup:
subdirectory tests: code cleanup, uncomment test
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions