hgext/strip.py

--- a/hgext/strip.py	Sun Jun 09 01:13:13 2019 +0530
+++ b/hgext/strip.py	Sun Jun 09 02:12:58 2019 +0530
@@ -32,10 +32,12 @@
 testedwith = 'ships-with-hg-core'
 
 def checklocalchanges(repo, force=False):
-    cmdutil.checkunfinished(repo)
     s = repo.status()
     if not force:
+        cmdutil.checkunfinished(repo)
         cmdutil.bailifchanged(repo)
+    else:
+        cmdutil.checkunfinished(repo, skipmerge=True)
     return s
 
 def _findupdatetarget(repo, nodes):