summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2009-04-06 08:31:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 05:19:56 (GMT)
commit1c0f3d224eff2ff8ca8442811edb5a6830adba1a (patch)
treeea2abaf978b348dc99b31a304381e6146cdc5c9a /Documentation/merge-config.txt
parent8b7332221db8522fe23bf8cf25d058acea6b9142 (diff)
downloadgit-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.zip
git-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.gz
git-1c0f3d224eff2ff8ca8442811edb5a6830adba1a.tar.bz2
difftool/mergetool: add diffuse as merge and diff tool
This adds diffuse as a built-in merge tool. Signed-off-by: Sebastian Pipping <sebastian@pipping.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
-rw-r--r--Documentation/merge-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8c10f66..4832bc7 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -23,7 +23,7 @@ merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
- "ecmerge", tortoisemerge and
+ "diffuse", "ecmerge", "tortoisemerge", and
"opendiff". Any other value is treated is custom merge tool
and there must be a corresponding mergetool.<tool>.cmd option.