From: Pratyush Yadav <me@yadavpratyush.com>
Date: Mon, 08 Jun 2020 09:49:51 GMT
Subject: Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
Message-ID: <20200608094951.pu2fz3kxaj37tk46@yadavpratyush.com>
In-Reply-To: <pull.781.git.git.1588901124066.gitgitgadget@gmail.com>

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@zoom.us>
> 
> 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@yahoo.com>

... your name and email in "From:" and "Signed-off-by:" should be the 
same. So either use "lin.sun" <lin.sun@zoom.us> in both places or use 
Lin Sun <sunlin7@yahoo.com> in both.

-- 
Regards,
Pratyush Yadav