merge-recursive: Add comments about handling rename/add-source cases
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:05 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit7769a75...96f998b2f1ef51e8a2e88058f56fa519
tree19146cd...e2423c0ceca3da760aabb1707eb8bb1ecopy hash to clipboard (tree)
parent0a6b871...6e6a4e2649f6da23db67eeaad11d102ecopy hash to clipboard (diff)
merge-recursive.c