delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	mergetools/meld: Use '--output' when available	David Aguilar	2011-08-19	1	-1/+24
\| \| \| \| \| \| \| \| \|	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>
*	mergetool--lib: Refactor tools into separate files	David Aguilar	2011-08-19	15	-0/+306
	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>