D932: filemerge: introduce functions to halt merge flow

ryanmce (Ryan McElroy) phabricator at mercurial-scm.org
Fri Oct 6 06:39:28 EDT 2017


ryanmce added inline comments.

INLINE COMMENTS

> configitems.py:302
>  )
> +coreconfigitem('merge', 'onfailure',
> +    default='continue',

this could be `on-failure`, per the comment on https://phab.mercurial-scm.org/D789

REPOSITORY
  rHG Mercurial

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

To: ryanmce, #hg-reviewers, krbullock, mbthomas
Cc: krbullock, pulkit, mercurial-devel


More information about the Mercurial-devel mailing list