tree 006b875202c979427616145a4259958b937cefe9
parent a08a83db2bf27f015bec9a435f6d73e223c21c5e
author Lin Sun <lin.sun@zoom.us> 1588807874 +0800
committer Junio C Hamano <gitster@pobox.com> 1600301480 -0700

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>