[PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior

Subject: [PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior
From: <lin.sun@xxxxxxx>
Date: Tue, 30 Jun 2020 19:37:51 +0800
Cc: "'sunlin via GitGitGadget'" <gitgitgadget@xxxxxxxxx>, <git@xxxxxxxxxxxxxxx>, "'sunlin'" <sunlin7@xxxxxxxxx>
In-reply-to: <20200630074204.GA2144485@gmail.com>
References: <pull.781.v2.git.git.1591672753363.gitgitgadget@gmail.com> <pull.781.v3.git.git.1593414441313.gitgitgadget@gmail.com> <xmqqeepxfmdm.fsf@gitster.c.googlers.com> <20200630074204.GA2144485@gmail.com>
Thread-index: AQHRJ5MuIWMkBHXT+uLjlpK0dGJPAAHpZEAUAj9VN80CNchbFajIYZWQ

The last change also available in https://github.com/git/git/pull/781/files.

References:
- [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior
  - From: sunlin via GitGitGadget
- [PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior
  - From: sunlin via GitGitGadget
- Re: [PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior
  - From: Junio C Hamano
- Re: [PATCH v3] Enable auto-merge for meld to follow the vim-diff beharior
  - From: David Aguilar