From: Elijah Newren Date: Thu, 19 Apr 2018 17:58:13 +0000 (-0700) Subject: merge-recursive: fix remaining directory rename + dirty overwrite cases X-Git-Tag: v2.18.0-rc0~50^2~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/18797a3b10e4077473740b953651b0032828d0fb?hp=18797a3b10e4077473740b953651b0032828d0fb merge-recursive: fix remaining directory rename + dirty overwrite cases Reviewed-by: Stefan Beller Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano ---