summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-03-06 00:05:16 -0500
committerTheodore Ts'o <tytso@mit.edu>2007-03-13 20:14:05 -0400
commitc4b4a5af1604a7546c0b0786e47bcff8a47a6039 (patch)
tree31a585ea3f75de124e44ab415316a16857e8b6b7 /.gitignore
parent27ebd6e0443bdd795869f598ecebc9eadd64a26c (diff)
downloadgit-c4b4a5af1604a7546c0b0786e47bcff8a47a6039.tar.gz
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>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 0eaba0a278..27797d1491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,7 @@ git-merge-ours
git-merge-recursive
git-merge-resolve
git-merge-stupid
+git-mergetool
git-mktag
git-mktree
git-name-rev