More complete merge support.
Fix copy-pasted comments
Abort merge command
Better menu groupings