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)
commit605c1bc...c46b60f76dfb4f89f76029b7bb13d232
tree8e5560d...f76d3f3e013d9cd9fff380bdde74c4cecopy hash to clipboard (tree)
parent09c01f8...6f65ffdde9a61708a5d74a372d68807acopy hash to clipboard (diff)
merge-recursive.c