projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 27ebd6e) | patch
Add git-mergetool to run an appropriate merge conflict resolution program
authorTheodore Ts'o <tytso@mit.edu>
Tue, 6 Mar 2007 05:05:16 +0000 (00:05 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 14 Mar 2007 00:14:05 +0000 (20:14 -0400)
commitc4b4a5af1604a7546c0b0786e47bcff8a47a6039
tree31a585ea3f75de124e44ab415316a16857e8b6b7tree | snapshot
parent27ebd6e0443bdd795869f598ecebc9eadd64a26ccommit | diff
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>
.gitignore diff | blob | history
Documentation/config.txt diff | blob | history
Documentation/git-mergetool.txt [new file with mode: 0644] blob
Makefile diff | blob | history
git-mergetool.sh [new file with mode: 0755] blob
Git—the stupid content tracker