]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 81f5a2c) | patch
t6036: add a failed conflict detection case with submodule modify/modify
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 04:11:19 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 21:43:42 +0000 (14:43 -0700)
commitd4d17180808437fd732a9d14388657b8f609ad4a
treea1540ef0a6a092c6e763095a27da1ac39207e51etree | snapshot
parent81f5a2ce7bd9a4a7114e420ef4544cf7ce29ad9bcommit | diff
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>
t/t6036-recursive-corner-cases.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.