diff -r 5eaa5eb0db4e -r da2e874fe582 tests/test-resolve.t
--- a/tests/test-resolve.t	Fri Nov 02 14:18:29 2018 -0400
+++ b/tests/test-resolve.t	Fri Nov 02 11:57:45 2018 -0700
@@ -445,6 +445,19 @@
   $ hg resolve -l
   R file1
   R file2
+Test with marking an explicit file as resolved, this should not abort (since
+there's no --force flag, we have no way of combining --all with a filename)
+  $ hg resolve --unmark
+  $ hg resolve -l
+  U file1
+  U file2
+(This downgrades to a warning since an explicit file was specified).
+  $ hg --config commands.resolve.mark-check=abort resolve -m file2
+  warning: the following files still have conflict markers:
+    file2
+  $ hg resolve -l
+  U file1
+  R file2
 Testing the --re-merge flag
   $ hg resolve --unmark file1
   $ hg resolve -l