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

	Commit message (Expand)	Author	Age	Files	Lines
*	git-mergetool: check return value from read	Jay Soffian	2011-09-19	1	-1/+1
*	Pass empty file to p4merge where no base is suitable.	Ciaran Jessup	2011-05-01	1	-6/+3
*	Merge branch 'ss/mergetool--lib'	Junio C Hamano	2011-03-19	1	-104/+121
\|\
\| *	mergetool--lib: Add Beyond Compare 3 as a tool	Sebastian Schuberth	2011-02-28	1	-2/+20
\| *	mergetool--lib: Sort tools alphabetically for easier lookup	Sebastian Schuberth	2011-02-28	1	-110/+109
* \|	mergetool-lib: call vim in readonly mode for diffs	Michael J Gruber	2011-02-25	1	-2/+2
\|/
*	mergetool-lib: make the three-way diff the default for vim/gvim	Dan McGee	2010-09-29	1	-3/+15
*	mergetool-lib: add a three-way diff view for vim/gvim	Dan McGee	2010-09-15	1	-2/+7
*	mergetool-lib: combine vimdiff and gvimdiff run blocks	Dan McGee	2010-09-15	1	-14/+3
*	mergetool: Remove explicit references to /dev/tty	Charles Bailey	2010-08-20	1	-1/+1
*	add shebang line to git-mergetool--lib.sh	Jeff King	2010-01-29	1	-0/+1
*	Merge branch 'rs/work-around-grep-opt-insanity'	Junio C Hamano	2009-11-25	1	-7/+6
\|\
\| *	mergetool--lib: simplify guess_merge_tool()	René Scharfe	2009-11-23	1	-7/+6
* \|	mergetool--lib: add p4merge as a pre-configured mergetool option	Scott Chacon	2009-10-28	1	-2/+15
\|/
*	mergetool--lib: add support for araxis merge	David Aguilar	2009-05-24	1	-2/+23
*	mergetool--lib: specialize diff options for emerge and ecmerge	David Aguilar	2009-05-09	1	-3/+3
*	mergetool--lib: simplify API usage by removing more global variables	David Aguilar	2009-04-12	1	-51/+58
*	difftool/mergetool: refactor commands to use git-mergetool--lib	David Aguilar	2009-04-08	1	-0/+378