Re: [PATCH 2/2] cherry-pick/revert: add scissors line on merge conflict

2019-03-06 Thread Denton Liu
Hi Phillip, sorry I forgot to address one of your replies. On Wed, Mar 06, 2019 at 04:29:20PM +, Phillip Wood wrote: > Hi Denton > > On 06/03/2019 10:30, Denton Liu wrote: > >Fix a bug where the scissors line is placed after the Conflicts: > >section, in the case where a merge conflict occurs

Re: [PATCH 2/2] cherry-pick/revert: add scissors line on merge conflict

2019-03-06 Thread Denton Liu
Hi Phillip, On Wed, Mar 06, 2019 at 04:29:20PM +, Phillip Wood wrote: > Hi Denton > > On 06/03/2019 10:30, Denton Liu wrote: > >Fix a bug where the scissors line is placed after the Conflicts: > >section, in the case where a merge conflict occurs and > >commit.cleanup = scissors. > > Was tha

Re: [PATCH 2/2] cherry-pick/revert: add scissors line on merge conflict

2019-03-06 Thread Phillip Wood
Hi Denton On 06/03/2019 10:30, Denton Liu wrote: Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Was that the case with cherry-pick and revert as well as merge, or were they missing the scissors