projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 09c01f8) | patch
merge-recursive: Nuke rename/directory conflict detection
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:49 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:38 +0000 (17:32 -0700)
commit605c1bcfc46b60f76dfb4f89f76029b7bb13d232
tree8e5560d7f76d3f3e013d9cd9fff380bdde74c4cetree | snapshot
parent09c01f856f65ffdde9a61708a5d74a372d68807acommit | diff
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>
merge-recursive.c diff | blob | history
Git—the stupid content tracker