diff options
| author |  Theodore Ts'o <tytso@mit.edu> | 2007-03-27 11:38:59 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-03-29 10:06:28 -0400 |
| commit | e15b484f6af581270f2ee03149e4e0d6af053ddf (patch) | |
| tree | 8a4cdcde784fe8829e6134ed75c2486a03c3bf50 | |
| parent | Bisect: Use "git-show-ref --verify" when reseting. (diff) | |
| download | tgif-e15b484f6af581270f2ee03149e4e0d6af053ddf.tar.xz | |
Fix minor formatting issue in man page for git-mergetool
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | Documentation/git-mergetool.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 5baaaca0b5..34288fe08b 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/git-mergetool.txt @@ -26,11 +26,11 @@ OPTIONS Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. - - If a merge resolution program is not specified, 'git mergetool' - will use the configuration variable merge.tool. If the - configuration variable merge.tool is not set, 'git mergetool' - will pick a suitable default. ++ +If a merge resolution program is not specified, 'git mergetool' +will use the configuration variable merge.tool. If the +configuration variable merge.tool is not set, 'git mergetool' +will pick a suitable default. Author ------ |