From: Lin Sun Date: Tue, 15 Sep 2020 00:55:09 GMT Subject: Re: [PATCH v18] Support auto-merge for meld to follow the vim-diff behavior Message-ID: In-Reply-To: Hi Junio, > conflict … It’s my typo. Thank you for fixing it. Best Regards Lin Sun