Skip to content
Snippets Groups Projects
Commit 1acaa9f37377 authored by Taapas Agrawal's avatar Taapas Agrawal
Browse files

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
parent 4a3abb33380a
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment