diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-04 07:07:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-04 07:07:37 +0000 |
| commit | ee62a7b284d15bc30fbbca7fd3bf86710de148bc (patch) | |
| tree | 9bea66cd0765cccc098c9c018e5734e36a2c9e6f /git-mergetool.txt | |
| parent | b63afffe7defea8a86848a96bea694e7fa0dc0cd (diff) | |
| download | git-htmldocs-ee62a7b284d15bc30fbbca7fd3bf86710de148bc.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc1-20-g86b9
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 34288fe08..add01e855 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the |