D1829: merge: add `--abort` flag which can abort the merge

[yuja (Yuya Nishihara)]

yuja added inline comments.

INLINE COMMENTS

> commands.py:3563
>  
> -    To undo an uncommitted merge, use :hg:`update --clean .` which
> +    To undo an uncommitted merge, use :hg:`merge --abort .` which
>      will check out a clean copy of the original merge parent, losing

Dropped ` .` in flight.

> hg.py:864
> +            # there were conflicts
> +            node = hex(ms._local)
> +        else:

It seems `ms.localctx` is the public interface. Can you send a followup?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1829

To: pulkit, #hg-reviewers, durin42
Cc: yuja, durin42, mercurial-devel