diff options
| author | Štěpán Němec <stepan.nemec@gmail.com> | 2010-10-08 19:31:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-08 12:31:07 -0700 |
| commit | 0adda9362ab080b0994355c5a3183a896a606cc0 (patch) | |
| tree | b771761820f86c51419f70be6401b38d9cad34fa /Documentation/git-mergetool.txt | |
| parent | 01398df31cd5a667faa005e85eb3c9aac66aaf44 (diff) | |
| download | git-0adda9362ab080b0994355c5a3183a896a606cc0.tar.gz | |
Use parentheses and `...' where appropriate
Remove some stray usage of other bracket types and asterisks for the
same purpose.
Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index e4ed016146..1f75a848ba 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS -------- -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]... +'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...] DESCRIPTION ----------- |