From: Elijah Newren <newren@gmail.com>
Date: Wed, 14 Feb 2018 18:51:57 +0000 (-0800)
Subject: merge-recursive: add computation of collisions due to dir rename & merging
X-Git-Tag: v2.18.0-rc0~169^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ea625cb0274c6907fba02f7af3ab83458b331a1e?hp=ea625cb0274c6907fba02f7af3ab83458b331a1e

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 <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---