"sunlin via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Lin Sun <lin.sun@xxxxxxx> > > 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@xxxxxxxxx> > Helped-by: David Aguilar <davvid@xxxxxxxxx> > Signed-off-by: Lin Sun <lin.sun@xxxxxxx> > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > Enable auto-merge for meld to follow the vimdiff beharior > > Hi, the mergetool "meld" does NOT merge the no-conflict changes, while > the mergetool "vimdiff" will merge the no-conflict changes and highlight > the conflict parts. This patch will make the mergetool "meld" similar to > "vimdiff", auto-merge the no-conflict changes, highlight conflict parts. Thanks.
