David Aguilar <davvid@xxxxxxxxx> writes: > git difftool listed some candidates for mergetools twice, depending on > the environment. > > This slightly changes the behavior when both KDE_FULL_SESSION and > GNOME_DESKTOP_SESSION_ID are set at the same time; in such a case > meld is used in favor of kdiff3 (the old code favored kdiff3 in such a > case), but it should not matter in practice. > > Signed-off-by: David Aguilar <davvid@xxxxxxxxx> > --- > > Hi Junio > > This is based on top of Markus's kompare patch: > "contrib/difftool: add support for Kompare" > http://article.gmane.org/gmane.comp.version-control.git/107883 Ok, so I'll add "Acked-by: David Aguilar <davvid@xxxxxxxxx>" to Markus's patch and apply it. Thanks -- 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
