diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-30 08:52:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-30 08:52:26 +0000 |
| commit | 3aa81825100a7380b2dec081876323507b150a95 (patch) | |
| tree | 8bc052b9ca43f34e85e11f64d9236dc767c2e532 /git-mergetool.txt | |
| parent | 2fc92604e7f1634018085145b1861d1105dff5e5 (diff) | |
| download | git-htmldocs-3aa81825100a7380b2dec081876323507b150a95.tar.gz | |
Autogenerated HTML docs for v1.5.1-rc3-20-gaa453
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 5baaaca0b..34288fe08 100644 --- a/git-mergetool.txt +++ b/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 ------ |