summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorJames Bowes <jbowes@dangerouslyinc.com>2007-03-19 02:11:54 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2007-03-19 02:13:48 (GMT)
commit9cec65399d3575774910b21c1cfd762a5e88a245 (patch)
treeea9a9901df003f61123a0dc68980d9200e0f7ecb /Documentation/git-mergetool.txt
parent7976ce1b909f8d61aa40108f8443e9fe585d15ac (diff)
downloadgit-9cec65399d3575774910b21c1cfd762a5e88a245.zip
git-9cec65399d3575774910b21c1cfd762a5e88a245.tar.gz
git-9cec65399d3575774910b21c1cfd762a5e88a245.tar.bz2
mergetool: Add support for vimdiff.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-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 ae69a0e..5baaaca 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, and emerge.
+ kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the