D6735: update: added support for --abort flag(issue4404)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Nice start! If I remember correctly, the mergestate stores the local version of the file. We can use that directly instead.

INLINE COMMENTS

> hg.py:992
> +    for f in ms:
> +        ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
> +        ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)

this line is not required.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6735/new/

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

To: taapas1128, #hg-reviewers
Cc: pulkit, mjpieters, mercurial-devel