supports cherry-pick and revert for merge commits
redesigned MergeDialog