kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
26,678 Commits
7 Branches
1,000 Tags
174 MiB
Commit Graph

2 Commits (804e97fc77b3398db5461fdd79f2f96f6acf467d)

Author SHA1 Message Date
David Aguilar f61bd9c68a mergetools/meld: Use '--output' when available 
meld 1.5.0 and newer allow the output file to be specified
when merging multiple files.  Check whether the meld command
supports '--output' and use it when available.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-08-19 10:52:16 -07:00
David Aguilar bc7a96a896 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>
 2011-08-19 00:09:19 -07:00