D6588: abort: added support for merge
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Jul 10 16:50:26 EDT 2019
This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.
> pulkit wrote in hg.py:987
> Here the user is already running `hg merge --abort`, so we should not show this message.
> Ideally, this `if` condition should not never when aborting a merge.
Turns out I am blind and the previous version already had everything correct. I will either apply previous version of fix things in flight.
CHANGES SINCE LAST ACTION
To: taapas1128, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel