projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 451a3ab) | patch
t6036: add a failed conflict detection case: regular files, different modes
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 04:11:22 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 15:40:29 +0000 (08:40 -0700)
commit5d1daf30cce5744b219002e0a6da015a13216cd1
tree941fd62b23af3f02871c20b38b276b60b223a2e3tree | snapshot
parent451a3abc262575e5ed325b71547d345c55cc7d1dcommit | diff
t6036: add a failed conflict detection case: regular files, different modes

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 | blame | history
Unnamed repository; edit this file 'description' to name the repository.