tests/test-resolve.t
changeset 21263 f3e37409ecd3
parent 16913 f2719b387380
child 21264 4e932dc5c113
--- a/tests/test-resolve.t	Fri Apr 18 18:19:46 2014 -0700
+++ b/tests/test-resolve.t	Fri Apr 18 18:26:42 2014 -0700
@@ -26,6 +26,13 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
 
+resolve -l should contain an unresolved entry
+
+  $ hg resolve -l
+  U file
+
+resolve the failure
+
   $ echo resolved > file
   $ hg resolve -m file
   $ hg commit -m 'resolved'