diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
| commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
| tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-mergetool.txt | |
| parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
| download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 68ed6c095..4a6f7f3a2 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -27,7 +27,7 @@ OPTIONS Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, - diffuse, tortoisemerge, opendiff and araxis. + diffuse, tortoisemerge, opendiff, p4merge and araxis. + If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the |