Ctrl+Z undo support whilst doing a manual merge
When doing a manual merge you might be experimenting, so undoing a line change is invaluable.
9
votes

When doing a manual merge you might be experimenting, so undoing a line change is invaluable.