mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![]() Individual merge tools are now defined in a mergetools/$tool file which is sourced at runtime. The individual files are installed into $(git --exec-path)/mergetools/. New tools can be added by creating a new file instead of editing the git-mergetool--lib.sh scriptlet. http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006 Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
---|---|---|
.. | ||
araxis | ||
bc3 | ||
defaults | ||
diffuse | ||
ecmerge | ||
emerge | ||
kdiff3 | ||
kompare | ||
meld | ||
opendiff | ||
p4merge | ||
tkdiff | ||
tortoisemerge | ||
vim | ||
xxdiff |