D3988: resolve: add confirm config option

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Wed Aug 1 13:07:21 UTC 2018


pulkit added inline comments.

INLINE COMMENTS

> commands.py:4536
>  
> +    if confirm and not ui.promptchoice(_(b're-merge all unresolved files (yn)?'
> +                                         b'$$ &Yes $$ &No')):

I missed that we need --all, so make this prompt only when `--all` is passed.

> configitems.py:1159
>  )
> +coreconfigitem('ui', 'resolve.confirm',
> +    default=False,

commands.resolve.confirm sounds a better place.

REPOSITORY
  rHG Mercurial

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

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


More information about the Mercurial-devel mailing list