HomePhabricator

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

Authored by taapas1128.

Description

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

This ensures to abort strip to hg strip when we have a merge
in progress and allow it only when a --force flag is used.

Differential Revision: https://phab.mercurial-scm.org/D6529