git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 53e32d4)
merge-recursive: add computation of collisions due to dir rename & merging
authorElijah Newren <redacted>
Wed, 14 Feb 2018 18:51:57 +0000 (10:51 -0800)
committerJunio C Hamano <redacted>
Wed, 14 Feb 2018 21:02:53 +0000 (13:02 -0800)
commitea625cb0274c6907fba02f7af3ab83458b331a1e
tree2ece0a842eb7e4c79c707fc43ab984c4bbcb4247tree | snapshot
parent53e32d4652a5cb073c8add8e7867fd7e76c2deffcommit | 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