diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:06 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:05 -0700 |
| commit | 2adc7dcc111636ed16601dc7516ced1c5cfda088 (patch) | |
| tree | d40b124b9f9be45e4b74c7991cbcc3bb32d2031b /commit.c | |
| parent | conflict_rename_delete(): Check whether D/F conflicts are still present (diff) | |
| download | git-2adc7dcc111636ed16601dc7516ced1c5cfda088.tar.gz git-2adc7dcc111636ed16601dc7516ced1c5cfda088.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions