Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.7.7.4 2011-08-19T07:09:19Z 2011-08-19T07:09:19Z David Aguilar davvid@gmail.com 2011-08-18T07:23:46Z urn:sha1:bc7a96a8965d4ce0651689301e1702a942dfb9f0 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>