]> git.ipfire.org Git - thirdparty/git.git/commit
mergetool: allow auto-merge for meld to follow the vim-diff behavior
authorLin Sun <lin.sun@zoom.us>
Wed, 6 May 2020 23:31:14 +0000 (07:31 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Sep 2020 00:11:20 +0000 (17:11 -0700)
commitdbd8c09bfe9d783ae01121bafb26a2dd108c0c3f
tree006b875202c979427616145a4259958b937cefe9
parenta08a83db2bf27f015bec9a435f6d73e223c21c5e
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>
Documentation/config/mergetool.txt
builtin/config.c
mergetools/meld