Cherry-pick mode

• Add mn keymap for merging with --no-ff
• Add keymap and conflict-resolving mode for cherry-picking
• Fix a bug where failure to do an operation would mess up the Vim windows