Documentation: let asciidoc align related options
Fixes the description of the -t option in git-mergetool, which failed to hint that it takes an argument. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Markus Heidelberg committed
Jan 16, 2009 at 22:42 UTC
6b89d068bd78b978743e96de7827d8a2a4d9f200
1 file changed
+4
-2
Documentation/git-mergetool.txt
+4
-2
@@ -22,7 +22,8 @@ with merge conflicts.
22
23
OPTIONS
24
-------
25
--t or --tool=<tool>::
25
+-t <tool>::
26
+--tool=<tool>::
27
Use the merge resolution program specified by <tool>.
28
Valid merge tools are:
29
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
@@ -60,7 +61,8 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.
61
Otherwise, 'git-mergetool' will prompt the user to indicate the
62
success of the resolution after the custom tool has exited.
63
63
--y or --no-prompt::
64
+-y::
65
+--no-prompt::
66
Don't prompt before each invocation of the merge resolution
67
program.
68