Why do we introduce that on the CherryPickCommand. It's an 
AbnormalMergeFailure ... so why don't we let MergeCommand throw
it. A cherry-pick will in the end also call mergeCommand and will
therefore also benefit from this new exceptions