mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![]() 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> |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
defaults | ||
deltawalker | ||
diffuse | ||
ecmerge | ||
emerge | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vim | ||
xxdiff |