X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Documentation%2Fgit-mergetool.txt;h=2a49de7cfe5188b531bc02f1115e253bfa10e0e0;hb=87d99c64dfa8880592104245896557aa530d4fd9;hp=f1f4e7a07ddd9f09aaccec9f93d14e6cc3689a0a;hpb=6d9990a959c0168ab6dfe75236980f95ac512ce5;p=git-core%2Fgit.git diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index f1f4e7a07..2a49de7cf 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