X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-mergetool.txt;h=a26c260162cf6cbab922dfd6320b1d440d7090ca;hb=2dfffd3e09b2541b1bfcc840a65eac0251832175;hp=78b2f433b083147491b8570228e082db0fe15fb6;hpb=e3fa2c761fdc490494e8e0855bcee4d7e58ada6a;p=git.git

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 78b2f433b..a26c26016 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, gvimdiff, and opendiff
+	kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable merge.tool.  If the