tree 2b1dc20b92036065f2ca1079b390ec1d588185f9
parent 53d1589ff6bd336e3ece39e0a963a3d2a537cf96
author Junio C Hamano <gitster@pobox.com> 1219910640 -0700
committer Junio C Hamano <gitster@pobox.com> 1220150503 -0700

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>