diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:29 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:29 +0300 |
| commit | 4aff18a3f02fece0d758427294907e7a80aa6bff (patch) | |
| tree | de8be4d77f8537e8b1d745e8bf97891feec42359 /Documentation | |
| parent | 458205ff0f43f8f0ffe70aa7f06d314fcce25809 (diff) | |
| parent | dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f (diff) | |
Merge branch 'ls/mergetool-meld-auto-merge'
The 'meld' backend of the "git mergetool" learned to give the
underlying 'meld' the '--auto-merge' option, which would help
reduce the amount of text that requires manual merging.
* ls/mergetool-meld-auto-merge:
mergetool: allow auto-merge for meld to follow the vim-diff behavior
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/mergetool.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index 09ed31dbfa..16a27443a3 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -30,6 +30,16 @@ mergetool.meld.hasOutput:: to `true` tells Git to unconditionally use the `--output` option, and `false` avoids using `--output`. +mergetool.meld.useAutoMerge:: + When the `--auto-merge` is given, meld will merge all non-conflicting + parts automatically, highlight the conflicting parts and wait for + user decision. Setting `mergetool.meld.useAutoMerge` to `true` tells + Git to unconditionally use the `--auto-merge` option with `meld`. + Setting this value to `auto` makes git detect whether `--auto-merge` + is supported and will only use `--auto-merge` when available. A + value of `false` avoids using `--auto-merge` altogether, and is the + default value. + 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 |