summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2007-06-06 01:19:47 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2007-06-10 12:27:29 (GMT)
commit730b5b45fb8a7751106885d350466c197b671b1c (patch)
tree044bfa742a590ca404b1d92233a6eed7c6a7f6c0 /Documentation/git-mergetool.txt
parente58db03bbee4af96e60b6ac88b84c1c11b8b037e (diff)
downloadgit-730b5b45fb8a7751106885d350466c197b671b1c.zip
git-730b5b45fb8a7751106885d350466c197b671b1c.tar.gz
git-730b5b45fb8a7751106885d350466c197b671b1c.tar.bz2
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Documentation/git-mergetool.txt')
-rw-r--r--Documentation/git-mergetool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index b89c51c..6c32c6d 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -25,7 +25,7 @@ OPTIONS
-t or --tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
+
If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the