From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Aug 2010 19:01:32 GMT
Subject: Re: [PATCH v2] git-merge: ignore space support
Message-ID: <7vsk23u96b.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100824022820.GE17406@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> The flag layout worries me a bit because presumably the next extension
> would get bit 8, and so on.  What happens if xdiff learns another
> whitespace-ignoring mode?
> ...
> This function (like its cousin create_ll_flag) is ugly, as Bert
> noticed before.  I am starting to wonder if it would not be simpler
> to use
>
>  extern int ll_merge(..., const struct ll_merge_options *opts);
>
> treating NULL as a request for the default options.
>
> In other words, how about something like this?

Sounds like a good direction to go.