| commit | c6d3dd5daf60e7b33d5843bb5dec44fcf852d239 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 1 Jul 2018 04:11:17 +0000 (30 21:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jul 2018 21:43:42 +0000 (3 14:43 -0700) | ||
| tree | cb4a31b37245b97c318f5046d6eeb913f1c6ccce | treesnapshot (tar.gz zip) |
| parent | e3331758f12da22f4103eec7efe1b5304a9be5e9 | commitdiff |
t6036: add a failed conflict detection case with symlink modify/modify
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6036-recursive-corner-cases.sh | diffblobblamehistory |