kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
9,144 Commits
7 Branches
1,000 Tags
174 MiB
Commit Graph

3 Commits (0b59451c1be6be3d0df80be9dc8aeedb355ca44b)

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