tree d40b124b9f9be45e4b74c7991cbcc3bb32d2031b
parent a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d
author Elijah Newren <newren@gmail.com> 1284971346 -0600
committer Junio C Hamano <gitster@pobox.com> 1285807025 -0700

conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

This function is called from process_df_entry(), near the end of the merge.
Rather than just checking whether one of the sides of the merge had a
directory at the same path as one of our files, check whether that
directory is still present by this point of our merge.

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