David Aguilar, 06.04.2009: > diff --git a/Documentation/config.txt b/Documentation/config.txt > +diff.tool:: > + Controls which diff tool is used. `diff.tool` overrides > + `merge.tool` when used by linkgit:git-difftool[1] and has > + the same valid values as `merge.tool`. +kompare -tortoisemerge -- 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