D6529: strip: during merge allow strip only when -f is used

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> strip.py:54
> +        if len(repo[None].parents()) > 1:
> +            raise error.Abort(_('outstanding uncommitted merge'))
>          if s.modified or s.added or s.removed or s.deleted:

we will need a similar dance for i18n tool detection which is done below.

also we need to add excsuffix to error message too.

> test-strip.t:282
> +  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
>  

this and the similar changes below should be globbed as they were before.

REPOSITORY
  rHG Mercurial

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

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

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