Optionally include information about cherry-pick conflicts in MERGE_MSG