global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 20:40:08 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,712 Commits 6 Branches 1,000 Tags
a0cb94006ccc6bde6fe89b2a4d8bf7ea84c8b876
Commit Graph

4 Commits

Author SHA1 Message Date
Arjen Laarhoven
e4e92b3f4b Document 'opendiff' value in config.txt and git-mergetool.txt 
Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2007-05-03 22:56:23 -07:00
Theodore Ts'o
e15b484f6a Fix minor formatting issue in man page for git-mergetool 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
 2007-03-29 10:06:28 -04:00
James Bowes
9cec65399d mergetool: Add support for vimdiff. 
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
 2007-03-18 22:13:48 -04:00
Theodore Ts'o
c4b4a5af16 Add git-mergetool to run an appropriate merge conflict resolution program 
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>
 2007-03-13 20:14:05 -04:00