tests/test-resolve.out

--- a/tests/test-resolve.out	Tue Jun 29 09:11:55 2010 +0200
+++ b/tests/test-resolve.out	Tue Jun 29 12:18:42 2010 -0300
@@ -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