git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96e7ffb)
merge-recursive: add computation of collisions due to dir rename & merging
authorElijah Newren <redacted>
Thu, 19 Apr 2018 17:58:07 +0000 (10:58 -0700)
committerJunio C Hamano <redacted>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commite95ab70aac4f38f1d365cdc03a7a041920c9c27b
treea0b08c2367e3ad8b148500f040796448047dff07tree | snapshot
parent96e7ffbdc31d9e02e2548df5d9a9701e5a83651dcommit | diff
merge-recursive: add computation of collisions due to dir rename & merging

directory renaming and merging can cause one or more files to be moved to
where an existing file is, or to cause several files to all be moved to
the same (otherwise vacant) location.  Add checking and reporting for such
cases, falling back to no-directory-rename handling for such paths.

Reviewed-by: Stefan Beller <redacted>
Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
merge-recursive.h diff | blob | history
git clone https://git.99rst.org/PROJECT