merge-recursive: Cleanup and consolidation of rename_conflict_info
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:08 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14:19 -0700)
commit4f66dad...81c2ebc6e1143b6c116960bfcd837067
tree3ab08c6...9218c64d7bce3a5cb7502650a1fde854copy hash to clipboard (tree)
parentedd2faf...2eda344eca2c01bc0b1d9f7f2f002a42copy hash to clipboard (diff)
merge-recursive.c