From: Elijah Newren <newren@gmail.com>
Date: Thu, 19 Apr 2018 17:58:07 +0000 (-0700)
Subject: merge-recursive: add computation of collisions due to dir rename & merging
X-Git-Tag: v2.18.0-rc0~50^2~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e95ab70aac4f38f1d365cdc03a7a041920c9c27b?hp=e95ab70aac4f38f1d365cdc03a7a041920c9c27b

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>
---