diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-28 01:04:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-30 19:41:43 -0700 |
| commit | f2b25dd81f4ccbf42700bd15feeb2becf10331ab (patch) | |
| tree | 2b1dc20b92036065f2ca1079b390ec1d588185f9 /xdiff/xmacros.h | |
| parent | 53d1589ff6bd336e3ece39e0a963a3d2a537cf96 (diff) | |
| download | git-f2b25dd81f4ccbf42700bd15feeb2becf10331ab.tar.gz | |
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>
Diffstat (limited to 'xdiff/xmacros.h')
0 files changed, 0 insertions, 0 deletions