Abort a merge and recover the pre-merge state

Walk back a conflicted merge with `git merge --abort` and end up with a clean working tree on the original branch.