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

2019-03-12 Thread Phillip Wood
Hi Denton I've got a couple of small comments, but this looks fine to me On 11/03/2019 03:42, 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. Signed-off-by: Denton Liu --- Do

[PATCH v7 8/8] cherry-pick/revert: add scissors line on merge conflict

2019-03-10 Thread Denton Liu
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. Signed-off-by: Denton Liu --- Documentation/git-cherry-pick.txt | 7 +++ Documentation/git-revert.txt | 7 +++ builtin/merge.c