merge-recursive: Make modify/delete handling code reusable
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:19 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commitb703325...0d2ba0f32b5006feff86d71242061011
treec331312...75e4770bdb6180d762417518d59060b3copy hash to clipboard (tree)
parent434b852...e7a68893106f6360ff0a261f03c37512copy hash to clipboard (diff)
merge-recursive.c
t/t6022-merge-rename.sh