David Aguilar <davvid@xxxxxxxxx> writes: > I would prefer to treat this as a bugfix rather than introducing > a new set of configuration knobs if possible. It really does > seem like a correction. > > Users that want the traditional behavior can get that by > configuring a custom mergetool.p4merge.cmd, so we're not > completely losing the ability to get at the old behavior. > > Users that want to see a reverse diff with difftool can > already say "--reverse", so there's even less reason to > have it there (though I know we're talking about mergetool only). > ... > I would much rather prefer to have the default/mainstream > behavior be the best out-of-the-box sans configuration. > > The reasoning behind swapping them for p4merge makes sense > for p4merge only. I don't think we're quite ready to declare > that all the merge tools need to be swapped or that we need a > mechanism for swapping the order. Thanks for an injection of sanity. -- 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