From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 27 Jun 2008 13:17:13 GMT
Subject: Re: [PATCH 12/13] Build in merge
Message-ID: <20080627131713.GO29404@genesis.frugalware.org>
In-Reply-To: <4864E574.70700@freesurf.fr>

On Fri, Jun 27, 2008 at 03:04:52PM +0200, Olivier Marin <dkr@freesurf.fr> wrote:
> >> +       if (diff_use_color_default == -1)
> >> +               diff_use_color_default = git_use_color_default;
> >> +
> >>         argc = parse_options(argc, argv, builtin_merge_options,
> >>                         builtin_merge_usage, 0);
> > 
> > Have you tried this?
> 
> I did. I forget to say that it's on top of your patch, sorry.

Aah. I should have noticed that.

I see now, your hunk is necessary when color.diff and diff.color is not
set but color.ui is.

Thanks.