git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2a7c16c)
t642[23]: be more flexible for add/add conflicts involving pair renames
authorElijah Newren <redacted>
Mon, 10 Aug 2020 22:29:18 +0000 (22:29 +0000)
committerJunio C Hamano <redacted>
Mon, 10 Aug 2020 22:59:01 +0000 (15:59 -0700)
commite8eb99d4a6b2505c15a2be916d611f4e7f9cde2f
tree9ce19d69a7ec74de241e06b9583dc2c232f3323dtree | snapshot
parent2a7c16c9802b25de3497f60b2f3776d1a02477bbcommit | diff
t642[23]: be more flexible for add/add conflicts involving pair renames

Much like the last commit accepted 'add/add' and 'rename/add'
interchangably, we also want to do the same for 'add/add' and
'rename/rename'.  This also allows us to avoid the ambiguity in meaning
with 'rename/rename' (is it two separate files renamed to the same
location, or one file renamed on both sides but differently)?

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6422-merge-rename-corner-cases.sh diff | blob | history
t/t6423-merge-rename-directories.sh diff | blob | history
git clone https://git.99rst.org/PROJECT