diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 13:22:36 -0700 |
| commit | 93b74a7cfa47b636c060b033bc7d03319f7841e2 (patch) | |
| tree | be04beb52e39b68f389c575a530576f272cb80f4 /builtin.h | |
| parent | Merge branch 'nd/diff-apply-ita' (diff) | |
| parent | t6036: prefer test_when_finished to manual cleanup in following test (diff) | |
| download | tgif-93b74a7cfa47b636c060b033bc7d03319f7841e2.tar.xz | |
Merge branch 'en/merge-recursive-tests'
Clean up tests in t6xxx series about 'merge' command.
* en/merge-recursive-tests:
t6036: prefer test_when_finished to manual cleanup in following test
t6036, t6042: prefer test_cmp to sequences of test
t6036, t6042: prefer test_path_is_file, test_path_is_missing
t6036, t6042: use test_line_count instead of wc -l
t6036, t6042: use test_create_repo to keep tests independent
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions