On Sun, Jul 22, 2012 at 7:22 AM, Sebastian Schuberth <sschube...@gmail.com> wrote: > Hi, > > I was about to add a configuration for yet another mergetool when I realized > that git gui's mergetool.tcl pretty much duplicates git's mergetools/* > configuration files. Can some one tell me why this is necessary? I would > have expected git gui to simply rely on "git mergetool" to launch the > mergetool. Or, in case that git gui needs to use a different tool than the > one configured as mergetool, that mergetool.tcl somehow uses the > configuration from mergetools/*. > > Thanks for any insights.
I think the mergetool stuff in git-gui predates git-mergetool. Ditto the "external diff" stuff in gitk -- it predates git-difftool. It would be good to unify these so that the difftool/mergetool experience is consistent. As for how to have different diff/merge tools in GUI vs non-GUI modes -- we have 'diff.guitool' to override 'diff.tool' when "git difftool --gui" is used. We do not have an equivalent 'merge.guitool', but that would probably be the way to do it. -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
