projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 53d1589) | patch
xdl_fill_merge_buffer(): separate out a too deeply nested function
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Aug 2008 08:04:00 +0000 (01:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 31 Aug 2008 02:41:43 +0000 (19:41 -0700)
commitf2b25dd81f4ccbf42700bd15feeb2becf10331ab
tree2b1dc20b92036065f2ca1079b390ec1d588185f9tree | snapshot
parent53d1589ff6bd336e3ece39e0a963a3d2a537cf96commit | diff
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>
xdiff/xmerge.c diff | blob | history
Git—the stupid content tracker