| commit | f2b25dd81f4ccbf42700bd15feeb2becf10331ab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Aug 2008 08:04:00 +0000 (28 01:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 31 Aug 2008 02:41:43 +0000 (30 19:41 -0700) | ||
| tree | 2b1dc20b92036065f2ca1079b390ec1d588185f9 | treesnapshot (tar.gz zip) |
| parent | 53d1589ff6bd336e3ece39e0a963a3d2a537cf96 | commitdiff |
xdl_fill_merge_buffer(): separate out a too deeply nested function
This simply moves code around to make a separate function that prepares
a single conflicted hunk with markers into the buffer.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This simply moves code around to make a separate function that prepares
a single conflicted hunk with markers into the buffer.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| xdiff/xmerge.c | diffblobblamehistory |