summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorArjen Laarhoven <arjen@yaph.org>2007-05-03 18:29:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-04 05:56:23 (GMT)
commite4e92b3f4bead3ee17164db35a44f8904eac9104 (patch)
tree3f36be1c3f970b01371829848ac22de735ee70dc /Documentation/git-mergetool.txt
parent5318f69812b3a06326524852d965e6a79fa52f85 (diff)
downloadgit-e4e92b3f4bead3ee17164db35a44f8904eac9104.zip
git-e4e92b3f4bead3ee17164db35a44f8904eac9104.tar.gz
git-e4e92b3f4bead3ee17164db35a44f8904eac9104.tar.bz2
Document 'opendiff' value in config.txt and git-mergetool.txt
Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
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 34288fe..add01e8 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, and vimdiff.
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
+
If a merge resolution program is not specified, 'git mergetool'
will use the configuration variable merge.tool. If the