diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 22:30:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 22:30:43 (GMT) |
| commit | 84e74c64034dafe96edfb7a1f7272daa9149c1e3 (patch) | |
| tree | 70bff94c286a467fbef66065c27e2bb72c72f290 /repository.c | |
| parent | 3a2a1dc17077a27ad1a89db27cb1b4b374f3b0ff (diff) | |
| parent | 651f7f3a1b15beec5319ea95b91a7461c805f37b (diff) | |
| download | git-84e74c64034dafe96edfb7a1f7272daa9149c1e3.zip git-84e74c64034dafe96edfb7a1f7272daa9149c1e3.tar.gz git-84e74c64034dafe96edfb7a1f7272daa9149c1e3.tar.bz2 | |
Merge branch 'en/t6042-insane-merge-rename-testcases'
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
* en/t6042-insane-merge-rename-testcases:
t6042: add testcase covering long chains of rename conflicts
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
t6042: add testcase covering rename/add/delete conflict type
Diffstat (limited to 'repository.c')
0 files changed, 0 insertions, 0 deletions