From: Elijah Newren <newren@gmail.com>
Date: Wed, 14 Feb 2018 18:52:03 +0000 (-0800)
Subject: merge-recursive: fix remaining directory rename + dirty overwrite cases
X-Git-Tag: v2.18.0-rc0~169^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bbafab7f326146dc9a8bcf42071574dc22fbed5e?hp=bbafab7f326146dc9a8bcf42071574dc22fbed5e

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