|
|
|
@ -26,11 +26,11 @@ OPTIONS
@@ -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 |
|
|
|
|
------ |
|
|
|
|