diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:49 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:38 -0700 |
| commit | 605c1bcfc46b60f76dfb4f89f76029b7bb13d232 (patch) | |
| tree | 8e5560d7f76d3f3e013d9cd9fff380bdde74c4ce /commit.c | |
| parent | merge-recursive: Rename conflict_rename_rename*() for clarity (diff) | |
| download | git-605c1bcfc46b60f76dfb4f89f76029b7bb13d232.tar.gz git-605c1bcfc46b60f76dfb4f89f76029b7bb13d232.zip | |
merge-recursive: Nuke rename/directory conflict detection
Since we want to resolve merges in-core and then detect at the end whether
D/F conflicts remain in the way, we should just apply renames in-core and
let logic elsewhere check for D/F conflicts.
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