diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -787,6 +787,9 @@
     ignored (such as when 'update --check' runs).
 
     'hint' is the usual hint given to Abort exception.
+
+    It's probably good to check statemod.checkunfinished() right before
+    this.
     """
 
     if merge and repo.dirstate.p2() != nullid: