mergetool--lib: Sort tools alphabetically for easier lookup

[git.git] / Documentation / git-mergetool.txt

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 1f75a848ba36728eeaa67e5cbbc209075393193b..4987245aca2877f233ab26f2cf244430b2da8211 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,8 +26,8 @@ OPTIONS
 --tool=<tool>::
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
-       kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
-       diffuse, tortoisemerge, opendiff, p4merge and araxis.
+       araxis, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
+       meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
 +
 If a merge resolution program is not specified, 'git mergetool'
 will use the configuration variable `merge.tool`.  If the