Merge branch 'dl/merge-cleanup-scissors-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:24 +0000 (00:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 May 2019 15:37:24 +0000 (00:37 +0900)
commitb877cb4...7ec2fafd03b6a3a70c26370744a32c1b
tree841a438...aea1aef57d9278bec5f966de5bb1ef7ecopy hash to clipboard (tree)
parentf757794...9dbd1152c0a557d3a07617ac2fa5bc09copy hash to clipboard (diff)
parent1a2b985...b375e7ce14932bfc59365024af2fb6abcopy hash to clipboard (diff)
builtin/commit.c
builtin/pull.c
builtin/tag.c
parse-options.h
sequencer.c
sequencer.h
t/t3507-cherry-pick-conflict.sh