summaryrefslogtreecommitdiff
path: root/t/t3900
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-04-19 10:58:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-08 16:11:00 +0900
commitf6f775591881036a3c4bfcf6737c9119c251537d (patch)
tree769a7e72d7ccd4107fe64e512a3448393cd7e9de /t/t3900
parentmerge-recursive: add computation of collisions due to dir rename & merging (diff)
downloadtgif-f6f775591881036a3c4bfcf6737c9119c251537d.tar.xz
merge-recursive: check for file level conflicts then get new name
Before trying to apply directory renames to paths within the given directories, we want to make sure that there aren't conflicts at the file level either. If there aren't any, then get the new name from any directory renames. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3900')
0 files changed, 0 insertions, 0 deletions