On Fri, Jun 27, 2008 at 03:04:52PM +0200, Olivier Marin <dkr@freesurf.fr> w=
rote:
quoted text
> >> +       if (diff_use_color_default =3D=3D -1)
> >> +               diff_use_color_default =3D git_use_color_default;
> >> +
> >>         argc =3D parse_options(argc, argv, builtin_merge_options,
> >>                         builtin_merge_usage, 0);
> >=20
> > Have you tried this?
>=20
> 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.