From: Elijah Newren <newren@gmail.com>
Date: Mon, 20 Sep 2010 08:29:07 +0000 (-0600)
Subject: merge_content(): Check whether D/F conflicts are still present
X-Git-Tag: v1.7.4-rc0~101^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4ab9a157d06956ce5a1060a28404cbade3039fa2?ds=sidebyside;hp=4ab9a157d06956ce5a1060a28404cbade3039fa2

merge_content(): Check whether D/F conflicts are still present

If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---