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
Description
Description
Details
Details
- Committed
taapas1128 Jun 14 2019, 8:55 AM - Differential Revision
- D6529: strip: during merge allow strip only when -f is used
- Parents
- rHG4a3abb33380a: deltas: set estimated compression upper bound to "3x" instead of "10x"
- Branches
- Unknown
- Tags