Re: [PATCH 01/16] xdl_merge(): add optional ancestor label to diff3-style output

Bert Wesarg wrote:

On Wed, Mar 17, 2010 at 12:46, Jonathan Nieder [off-list ref] wrote:

quoted

--- 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.

Not so clear to me:

 $ git grep -e '\* const' origin/master | wc -l
 90
 $ git grep -e '\*const' origin/master | wc -l
 23

I do prefer the style you suggest, so I’ve fixed it.

FWIW:

    Acked-by: Bert Wesarg [off-list ref]

Thanks for looking it over.  I’ll be sending a rebased version in a
moment including your ack; I hope that’s okay.

Jonathan