diff options
| author | Lin Sun <lin.sun@zoom.us> | 2020-05-06 23:31:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-17 00:11:20 (GMT) |
| commit | dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f (patch) | |
| tree | 006b875202c979427616145a4259958b937cefe9 /Documentation/config | |
| parent | a08a83db2bf27f015bec9a435f6d73e223c21c5e (diff) | |
| download | git-dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f.zip git-dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f.tar.gz git-dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f.tar.bz2 | |
mergetool: allow auto-merge for meld to follow the vim-diff behavior
Make the mergetool used with "meld" backend behave similarly to "vimdiff" by
telling it to auto-merge non-conflicting parts and highlight the conflicting
parts when `mergetool.meld.useAutoMerge` is configured with `true`, or `auto`
for detecting the `--auto-merge` option automatically.
Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -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 09ed31d..16a2744 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 |