]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: fix remaining directory rename + dirty overwrite cases
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:13 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 07:11:00 +0000 (16:11 +0900)
commit18797a3b10e4077473740b953651b0032828d0fb
treef47ccb5234057e94b141fa106e0363d8ac8b6e1c
parent64b1abe962b44e6bad84b980e8ea2811302e71c7
merge-recursive: fix remaining directory rename + dirty overwrite cases

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6043-merge-rename-directories.sh