git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-04 19:16:21 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
9,147 Commits 18 Branches 1,111 Tags
c0ce981f5ebfd02463ff697b2fca52c7a54b0625
Commit Graph

3 Commits

Author SHA1 Message Date
Theodore Ts'o
d6678c28e3 mergetool: print an appropriate warning if merge.tool is unknown 
Also add support for vimdiff

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
 2007-03-18 22:30:10 -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