merge-recursive: Create function for merging with branchname:file markers
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:17 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700)
commitdac4741...54e7672e69d1bc6b4f912cd16ad83b38
treeb452641...eff4b7a67d6458e5321cdc04e4ea7f57copy hash to clipboard (tree)
parent232c635...7e22acb2ddf526753fdcd3d3718afe99copy hash to clipboard (diff)
merge-recursive.c