Jonathan Nieder <jrnieder@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html