diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-07-23 00:51:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-07-23 00:51:59 +0000 |
| commit | 15567bc0c61c951197cb392b835678729534de57 (patch) | |
| tree | 8be698fd27be92da0c23a77720987071e73b1d69 /git-mergetool.txt | |
| parent | 708376e8576f6d39b62b27ee9dfe7292c652f728 (diff) | |
| download | git-htmldocs-15567bc0c61c951197cb392b835678729534de57.tar.gz | |
Autogenerated HTML docs for v1.7.6-345-g5c2f8
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 8c79ae8d2..347091010 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -7,6 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS -------- +[verse] 'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...] DESCRIPTION |