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
taapas1128 | Jun 14 2019, 8:55 AM |