diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-08 20:16:55 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-17 12:09:21 -0700 |
| commit | 0460ed2c93d78c753242f835c441f320f792ac54 (patch) | |
| tree | 7128ca5567b1ed56dba60845ad26b32c40d7a4f5 /Documentation/git-mergetool.txt | |
| parent | 9b795193a6a7e963db62d9cd8e86752a40940520 (diff) | |
| download | git-0460ed2c93d78c753242f835c441f320f792ac54.tar.gz | |
documentation: trivial style cleanups
White-spaces, missing braces, standardize --[no-]foo.
Signed-off-by: Felipe Contreras <felipe.contreras@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 6b563c500f..07137f252b 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -8,7 +8,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS -------- [verse] -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...] +'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...] DESCRIPTION ----------- |