X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-mergetool.txt;h=347091010995af95e43ced744b159b277bdb6cdc;hb=c2d53586ddfdde1ff625fe58299dc81db5e6f408;hp=8c79ae8d2a610bf4f1dea1a840bfc52e85d90fd9;hpb=f7d59e256884f63adeed9a1f3376a386a28681ff;p=git.git diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 8c79ae8d2..347091010 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -7,6 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS -------- +[verse] 'git mergetool' [--tool=] [-y|--no-prompt|--prompt] [...] DESCRIPTION