"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > Lee Marlow <lee.marlow@xxxxxxxxx> wrote: >> The --tool= long option can be completed with >> kdiff3 tkdiff meld xxdiff emerge >> vimdiff gvimdiff ecmerge opendiff >> >> Signed-off-by: Lee Marlow <lee.marlow@xxxxxxxxx> > > Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> > > ... for both patches in this series. But this is new functionality > so it probably won't be in 1.6.0; its too late in that release cycle. Heh, you are too cautious ;-) Both "log --merge" and mergetool have been with us for quite some time, and I certainly do not mind taking [2/2] if not both. -- 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
