Pieter Praet wrote:
> diff --git a/magit-key-mode.el b/magit-key-mode.el
> index 041763a..fb39086 100644
> --- a/magit-key-mode.el
> +++ b/magit-key-mode.el
> @@ -150,7 +150,8 @@ (defvar magit-key-mode-groups
> (merging
> (man-page "git-merge")
> (actions
> - ("m" "Merge" magit-manual-merge))
> + ("m" "Merge" magit-manual-merge)
> + ("A" "Abort" magit-merge-abort))
Definitely a good change. Note that --abort can have unpleasant
consequences when merge is run on a dirty worktree.
On a related note, you might also want to support pull/ rebase on a
dirty worktree leveraging rebase.autostash (new feature).
--
---
You received this message because you are subscribed to the Google Groups
"magit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
