Skip to content
Snippets Groups Projects
Commit bc7a96a8 authored by David Aguilar's avatar David Aguilar Committed by Junio C Hamano
Browse files

mergetool--lib: Refactor tools into separate files

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: default avatarDavid Aguilar <davvid@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 240dc3e8
Branches
Tags
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment