cherry-pick/revert: add scissors line on merge conflict
authorDenton Liu <liu.denton@gmail.com>
Wed, 17 Apr 2019 10:23:30 +0000 (11:23 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2019 03:05:36 +0000 (12:05 +0900)
commit1a2b985...b375e7ce14932bfc59365024af2fb6ab
tree037601e...8fa0b4b958b8342b77f991c75799ca97copy hash to clipboard (tree)
parentdc42e9a...3a9e9206566b6bc9b57f431b98682b29copy hash to clipboard (diff)
Documentation/git-cherry-pick.txt
Documentation/git-revert.txt
builtin/merge.c
builtin/revert.c
sequencer.c
sequencer.h
t/t3507-cherry-pick-conflict.sh