magit/magit — pull request #716 by daimrod (2013-07-13 15:24:56+00:00)
Title: Add an action to abort a merge

Permit to abort a merge, like you can abort a rebase.

* magit-key-mode.el (magit-key-mode-groups): Add binding to abort a merge.
* magit.el (magit-merge-abort): New command to abort a merge.