Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6036: add a failed conflict detection case: regular files, different modes
author
Elijah Newren
<newren@gmail.com>
Sun, 1 Jul 2018 04:11:22 +0000
(21:11 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 11 Jul 2018 15:40:29 +0000
(08:40 -0700)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
raw
|
patch
| inline |
side by side
(from:
5d1daf3
)
No differences found