Re: [PATCH v2] git-merge: ignore space support
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 13 quoted lines
> 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.
Junio C Hamano <gitster@pobox.com>