D6588: abort: added support for merge

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Thu Jul 4 13:39:00 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> test-commit-unresolved.t:45
>    [255]
> +#endif
> +

since there are only two cases, you can use `#else` here.

> test-commit-unresolved.t:169
>  
> +#if abortflag
>    $ hg merge --abort

We can put only the command in `if` and `else` part. The output is same on the both sides.

REPOSITORY
  rHG Mercurial

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

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

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


More information about the Mercurial-devel mailing list