diff options
| author |  David Aguilar <davvid@gmail.com> | 2011-08-18 00:23:46 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-19 00:09:19 -0700 |
| commit | bc7a96a8965d4ce0651689301e1702a942dfb9f0 (patch) | |
| tree | d4d6f70f97683090221c8f7ba4888a54e4d73a92 /Documentation/everyday.txt | |
| parent | mergetool--lib: Make style consistent with git (diff) | |
| download | tgif-bc7a96a8965d4ce0651689301e1702a942dfb9f0.tar.xz | |
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: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/everyday.txt')
0 files changed, 0 insertions, 0 deletions