Re: [PATCH v18] Support auto-merge for meld to follow the vim-diff behavior

Subject: Re: [PATCH v18] Support auto-merge for meld to follow the vim-diff behavior
From: Lin Sun <lin.sun@xxxxxxx>
Date: Tue, 15 Sep 2020 08:55:09 +0800
Cc: sunlin via GitGitGadget <gitgitgadget@xxxxxxxxx>, git@xxxxxxxxxxxxxxx, sunlin <sunlin7@xxxxxxxxx>
In-reply-to: <xmqqr1r4jf54.fsf@gitster.c.googlers.com>
References: <pull.781.v17.git.git.1594596738929.gitgitgadget@gmail.com> <pull.781.v18.git.git.1599895268433.gitgitgadget@gmail.com> <xmqqr1r4jf54.fsf@gitster.c.googlers.com>

Hi Junio,

> conflict …
It’s my typo. Thank you for fixing it.

Best Regards
Lin Sun

References:
- [PATCH v17] Support auto-merge for meld to follow the vim-diff behavior
  - From: sunlin via GitGitGadget
- [PATCH v18] Support auto-merge for meld to follow the vim-diff behavior
  - From: sunlin via GitGitGadget
- Re: [PATCH v18] Support auto-merge for meld to follow the vim-diff behavior
  - From: Junio C Hamano