David Aguilar a427ef7acc mergetool--lib: Allow custom commands to override built-ins ... Allow users to override the default commands provided by the mergetools/* scriptlets. Users occasionally run into problems where they expect to be able to override the built-in tool names. The documentation does not explicitly mention that built-ins cannot be overridden, so it's easy to assume that it should work. Lift this restriction so that built-in tools are handled the same way as user-configured tools. Add tests to guarantee this behavior. A nice benefit of this change is that it protects users from having future versions of git trump their custom configuration with a new built-in tool. C.f.: http://stackoverflow.com/questions/7435002/mergetool-from-gitconfig-being-ignored http://thread.gmane.org/gmane.comp.version-control.msysgit/13188 http://thread.gmane.org/gmane.comp.version-control.git/148267 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-09-25 09:04:39 -07:00
..
araxis
bc3	mergetools: use the correct tool for Beyond Compare 3 on Windows	2011-10-15 20:13:55 -07:00
defaults	mergetool--lib: Allow custom commands to override built-ins	2012-09-25 09:04:39 -07:00
deltawalker	mergetools: add a plug-in to support DeltaWalker	2012-03-05 09:31:47 -08:00
diffuse
ecmerge
emerge
kdiff3
kompare
meld	mergetools/meld: Use --help output to detect --output support	2012-02-10 14:53:18 -08:00
opendiff
p4merge
tkdiff
tortoisemerge
vim
xxdiff