diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:17 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:38 -0700 |
| commit | dac4741554e7672e69d1bc6b4f912cd16ad83b38 (patch) | |
| tree | b4526414eff4b7a67d6458e5321cdc04e4ea7f57 /t/t7605-merge-resolve.sh | |
| parent | merge-recursive: Record more data needed for merging with dual renames (diff) | |
| download | tgif-dac4741554e7672e69d1bc6b4f912cd16ad83b38.tar.xz | |
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>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions