* [PATCH] Document 'opendiff' value in config.txt and git-mergetool.txt
@ 2007-05-03 18:29 Arjen Laarhoven
0 siblings, 0 replies; only message in thread
From: Arjen Laarhoven @ 2007-05-03 18:29 UTC (permalink / raw)
To: Git Mailing List
Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
---
Documentation/config.txt | 2 +-
Documentation/git-mergetool.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c257cdf..24f9655 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -520,7 +520,7 @@ merge.summary::
merge.tool::
Controls which merge resolution program is used by
gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff",
- "meld", "xxdiff", "emerge", "vimdiff"
+ "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
merge.verbosity::
Controls the amount of output shown by the recursive merge
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
--
1.5.2.rc1.3.g7a150
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-05-03 18:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-03 18:29 [PATCH] Document 'opendiff' value in config.txt and git-mergetool.txt Arjen Laarhoven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).