diff options
| author |  Lin Sun <lin.sun@zoom.us> | 2020-05-07 07:31:14 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-16 17:11:20 -0700 |
| commit | dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f (patch) | |
| tree | 006b875202c979427616145a4259958b937cefe9 /ls-refs.c | |
| parent | The sixth batch (diff) | |
| download | tgif-dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f.tar.xz | |
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 'ls-refs.c')
0 files changed, 0 insertions, 0 deletions