diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-22 21:43:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 21:43:13 (GMT) |
| commit | b3743df73f9e0238ea360b2a640e5e5c99517e9a (patch) | |
| tree | c3397fa071bd755b83cd6e3cf3dc100b3cccf652 /Documentation/git-mergetool.txt | |
| parent | 4f9aba9c26d18d44e3a51b57d0e548a0cb39fcd9 (diff) | |
| parent | 7791a1d9b9a4f4e15662c7c9c7f5837f461bb987 (diff) | |
| download | git-b3743df73f9e0238ea360b2a640e5e5c99517e9a.zip git-b3743df73f9e0238ea360b2a640e5e5c99517e9a.tar.gz git-b3743df73f9e0238ea360b2a640e5e5c99517e9a.tar.bz2 | |
Merge branch 'mz/doc-synopsis-verse'
* mz/doc-synopsis-verse:
Documentation: use [verse] for SYNOPSIS sections
Conflicts:
Documentation/git-mergetool--lib.txt
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 8c79ae8..3470910 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=<tool>] [-y|--no-prompt|--prompt] [<file>...] DESCRIPTION |