]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool--lib.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 240dc3e) | patch
mergetool--lib: Refactor tools into separate files
authorDavid Aguilar <davvid@gmail.com>
Thu, 18 Aug 2011 07:23:46 +0000 (00:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2011 07:09:19 +0000 (00:09 -0700)
commitbc7a96a8965d4ce0651689301e1702a942dfb9f0
treed4d6f70f97683090221c8f7ba4888a54e4d73a92tree | snapshot
parent240dc3e8edb3ae4ee968febc006fa761811c60e6commit | diff
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>
17 files changed:
Makefile diff | blob | blame | history
git-mergetool--lib.sh diff | blob | blame | history
mergetools/araxis [new file with mode: 0644] blob
mergetools/bc3 [new file with mode: 0644] blob
mergetools/defaults [new file with mode: 0644] blob
mergetools/diffuse [new file with mode: 0644] blob
mergetools/ecmerge [new file with mode: 0644] blob
mergetools/emerge [new file with mode: 0644] blob
mergetools/kdiff3 [new file with mode: 0644] blob
mergetools/kompare [new file with mode: 0644] blob
mergetools/meld [new file with mode: 0644] blob
mergetools/opendiff [new file with mode: 0644] blob
mergetools/p4merge [new file with mode: 0644] blob
mergetools/tkdiff [new file with mode: 0644] blob
mergetools/tortoisemerge [new file with mode: 0644] blob
mergetools/vim [new file with mode: 0644] blob
mergetools/xxdiff [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.