diff -r 6bca9801c92a -r 51021f4c80b5 tests/test-resolve.out
--- a/tests/test-resolve.out	Wed Jun 23 16:54:12 2010 -1000
+++ b/tests/test-resolve.out	Sun Jun 27 23:12:05 2010 +0200
@@ -6,3 +6,4 @@
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 % resolve -l, should be empty
+% resolve -l, should be empty