tree 0f3d2f973c2aac4f780d10ba13c030498b62e508
parent 2adc7dcc111636ed16601dc7516ced1c5cfda088
author Elijah Newren <newren@gmail.com> 1284971347 -0600
committer Junio C Hamano <gitster@pobox.com> 1285807025 -0700

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>