tests/test-issue619.t
changeset 12316 4134686b83e1
parent 12195 ee41be2bbf5a
child 12328 b63f6422d2a7
--- a/tests/test-issue619.t	Thu Sep 16 16:12:26 2010 -0500
+++ b/tests/test-issue619.t	Thu Sep 16 17:51:32 2010 -0500
@@ -25,6 +25,7 @@
 
   $ hg merge b
   abort: merging with a working directory ancestor has no effect
+  [255]
 
   $ true