Re: [PATCH 01/16] xdl_merge(): add optional ancestor label to diff3-style output
flat view
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:48:26
On Wed, Mar 17, 2010 at 12:46, Jonathan Nieder [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index 8cbe45e..3a0ae14 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c@@ -397,6 +406,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1,int flags, xmparam_t const *xmp, mmbuffer_t *result) { xdmerge_t *changes, *c; xpparam_t const *xpp = &xmp->xpp; + const char * const ancestor_name = xmp->ancestor;
Style. * should be aligned to the variable name.
int i0, i1, i2, chg0, chg1, chg2; int level = flags & XDL_MERGE_LEVEL_MASK; int style = flags & XDL_MERGE_STYLE_MASK;
FWIW:
Acked-by: Bert Wesarg [off-list ref]