Hi Lin, I'm not familiar with the code so I'll let someone else comment on that. But... On 08/05/20 01:25AM, sunlin via GitGitGadget wrote: > From: "lin.sun" <lin.sun@xxxxxxx> > > The mergetool "meld" does NOT merge the no-conflict changes, while the > mergetool "vimdiff" will merge the no-conflict parts and highlight the > conflict parts. > This patch will make the mergetool "meld" similar to "vimdiff", > auto-merge the no-conflict parts, highlight conflict parts. > > Signed-off-by: Lin Sun <sunlin7@xxxxxxxxx> ... your name and email in "From:" and "Signed-off-by:" should be the same. So either use "lin.sun" <lin.sun@xxxxxxx> in both places or use Lin Sun <sunlin7@xxxxxxxxx> in both. -- Regards, Pratyush Yadav
