diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 15:15:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 15:15:13 -0700 |
| commit | b051caf02ee59e3c9d1da4a61339f667f28754d1 (patch) | |
| tree | 04b2ca42cc953959fa66006e8e750d26da86ea3e /git-mergetool.txt | |
| parent | 26aa6502e39e98238de17444d0d2a26999ea6445 (diff) | |
| download | git-htmldocs-b051caf02ee59e3c9d1da4a61339f667f28754d1.tar.gz | |
Autogenerated HTML docs for v2.0.0-153-g79dcc
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 07137f252..e846c2ed7 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -71,11 +71,13 @@ success of the resolution after the custom tool has exited. --no-prompt:: Don't prompt before each invocation of the merge resolution program. + This is the default if the merge resolution program is + explicitly specified with the `--tool` option or with the + `merge.tool` configuration variable. --prompt:: - Prompt before each invocation of the merge resolution program. - This is the default behaviour; the option is provided to - override any configuration settings. + Prompt before each invocation of the merge resolution program + to give the user a chance to skip the path. TEMPORARY FILES --------------- |