org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	mergetool: print an appropriate warning if merge.tool is unknown	Theodore Ts'o	2007-03-18
\| \| \| \| \| \|	Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
*	mergetool: Add support for vimdiff.	James Bowes	2007-03-18
\| \| \| \| \|	Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
*	Add git-mergetool to run an appropriate merge conflict resolution program	Theodore Ts'o	2007-03-13
	The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>