Update message about conflict resolution#120

Merged

sorenlouv merged 3 commits intomasterfrom add-test-to-cherry-picking

Apr 29, 2019

+227-128

Commits on Apr 28, 2019

Commits on Apr 29, 2019

Add test when cherry picking fails
sorenlouv
committed