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

	Commit message (Expand)	Author	Age	Files	Lines
*	mergetool: Clean up description of files and prompts for merge resolutions	Theodore Ts'o	2007-03-29	1	-12/+15
*	mergetool: Make git-rm quiet when resolving a deleted file conflict	Theodore Ts'o	2007-03-29	1	-1/+1
*	mergetool: Add support for Apple Mac OS X's opendiff command	Theodore Ts'o	2007-03-29	1	-2/+14
*	mergetool: Fix abort command when resolving symlinks and deleted files	Theodore Ts'o	2007-03-29	1	-4/+4
*	mergetool: Remove spurious error message if merge.tool config option not set	Theodore Ts'o	2007-03-29	1	-1/+1
*	mergetool: factor out common code	Theodore Ts'o	2007-03-29	1	-42/+36
*	mergetool: portability fix: don't use reserved word function	Theodore Ts'o	2007-03-29	1	-5/+5
*	mergetool: portability fix: don't assume true is in /bin	Theodore Ts'o	2007-03-29	1	-2/+2
*	mergetool: Don't error out in the merge case where the local file is deleted	Theodore Ts'o	2007-03-29	1	-6/+5
*	mergetool: Replace use of "echo -n" with printf(1) to be more portable	Theodore Ts'o	2007-03-29	1	-14/+12
*	mergetool: print an appropriate warning if merge.tool is unknown	Theodore Ts'o	2007-03-18	1	-4/+9
*	mergetool: Add support for vimdiff.	James Bowes	2007-03-18	1	-3/+5
*	Add git-mergetool to run an appropriate merge conflict resolution program	Theodore Ts'o	2007-03-13	1	-0/+352