@matheusbsbs / matheus-bagliano / commits / e15b484f6a
Fork 0

Fix minor formatting issue in man page for git-mergetool

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Theodore Ts'o committed Mar 27, 2007 at 11:38 UTC e15b484f6af581270f2ee03149e4e0d6af053ddf
1 file changed +5 -5
Documentation/git-mergetool.txt
+5 -5
@@ -26,11 +26,11 @@ OPTIONS
26 Use the merge resolution program specified by <tool>.
27 Valid merge tools are:
28 kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
29 -
30 - If a merge resolution program is not specified, 'git mergetool'
31 - will use the configuration variable merge.tool. If the
32 - configuration variable merge.tool is not set, 'git mergetool'
33 - will pick a suitable default.
29 ++
30 +If a merge resolution program is not specified, 'git mergetool'
31 +will use the configuration variable merge.tool. If the
32 +configuration variable merge.tool is not set, 'git mergetool'
33 +will pick a suitable default.
34
35 Author
36 ------