| commit | 93b74a7cfa47b636c060b033bc7d03319f7841e2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jun 2018 20:22:36 +0000 (25 13:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jun 2018 20:22:36 +0000 (25 13:22 -0700) | ||
| tree | be04beb52e39b68f389c575a530576f272cb80f4 | treesnapshot (tar.gz zip) |
| parent | ac997db0c13d3acde8fcb6c79ff095ba6bd27169 | commitdiff |
| parent | d43eba0ab5538bd9327b1e3c9ed00abb1c5b558d | commitdiff |
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
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