From: Elijah Newren <newren@gmail.com>
Date: Wed, 14 Feb 2018 18:52:00 +0000 (-0800)
Subject: merge-recursive: apply necessary modifications for directory renames
X-Git-Tag: v2.18.0-rc0~169^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b9616f149e46e1a97bf6dd5bc727a663d92dded?hp=3b9616f149e46e1a97bf6dd5bc727a663d92dded

merge-recursive: apply necessary modifications for directory renames

This commit hooks together all the directory rename logic by making the
necessary changes to the rename struct, it's dst_entry, and the
diff_filepair under consideration.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---