-
- Downloads
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>
Showing
- Makefile 11 additions, 0 deletionsMakefile
- git-mergetool--lib.sh 52 additions, 333 deletionsgit-mergetool--lib.sh
- mergetools/araxis 20 additions, 0 deletionsmergetools/araxis
- mergetools/bc3 20 additions, 0 deletionsmergetools/bc3
- mergetools/defaults 46 additions, 0 deletionsmergetools/defaults
- mergetools/diffuse 17 additions, 0 deletionsmergetools/diffuse
- mergetools/ecmerge 16 additions, 0 deletionsmergetools/ecmerge
- mergetools/emerge 23 additions, 0 deletionsmergetools/emerge
- mergetools/kdiff3 24 additions, 0 deletionsmergetools/kdiff3
- mergetools/kompare 7 additions, 0 deletionsmergetools/kompare
- mergetools/meld 9 additions, 0 deletionsmergetools/meld
- mergetools/opendiff 16 additions, 0 deletionsmergetools/opendiff
- mergetools/p4merge 10 additions, 0 deletionsmergetools/p4merge
- mergetools/tkdiff 12 additions, 0 deletionsmergetools/tkdiff
- mergetools/tortoisemerge 17 additions, 0 deletionsmergetools/tortoisemerge
- mergetools/vim 44 additions, 0 deletionsmergetools/vim
- mergetools/xxdiff 25 additions, 0 deletionsmergetools/xxdiff
Loading
Please register or sign in to comment