![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:17 +0000 (23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:38 +0000 (14:19 -0700) | ||
| commit | dac4741554e7672e69d1bc6b4f912cd16ad83b38 | |
| tree | b4526414eff4b7a67d6458e5321cdc04e4ea7f57 | tree | snapshot |
| parent | 232c635f7e22acb2ddf526753fdcd3d3718afe99 | commit | diff |
merge-recursive: Create function for merging with branchname:file markers
We want to be able to reuse the code to do a three-way file content merge
and have the conflict markers use both branchname and filename. Split it
out into a separate function.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We want to be able to reuse the code to do a three-way file content merge
and have the conflict markers use both branchname and filename. Split it
out into a separate function.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diff | blob | history |