| commit | d4d17180808437fd732a9d14388657b8f609ad4a | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 1 Jul 2018 04:11:19 +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 | a1540ef0a6a092c6e763095a27da1ac39207e51e | treesnapshot (tar.gz zip) |
| parent | 81f5a2ce7bd9a4a7114e420ef4544cf7ce29ad9b | commitdiff |
t6036: add a failed conflict detection case with submodule 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 |