diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:35:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-29 17:35:16 (GMT) |
| commit | 9db18387056c713eca8f53bff3bb409d23117f1d (patch) | |
| tree | cc2563f48b170c298e5a79e84b8809d02f4db639 /Documentation | |
| parent | af1b4e350f5f24e4fbc6f870c9e1552175b86b76 (diff) | |
| parent | b12d04503b0aba1f2d68b164b348cbf94bbe570b (diff) | |
| download | git-9db18387056c713eca8f53bff3bb409d23117f1d.zip git-9db18387056c713eca8f53bff3bb409d23117f1d.tar.gz git-9db18387056c713eca8f53bff3bb409d23117f1d.tar.bz2 | |
Merge branch 'da/mergetool-meld' into maint
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c55c22a..382e12c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1754,6 +1754,15 @@ mergetool.<tool>.trustExitCode:: if the file has been updated, otherwise the user is prompted to indicate the success of the merge. +mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable |