diff -r 31a01e3d99cc -r cdc458b12f0f tests/test-issue619.out
--- a/tests/test-issue619.out	Mon Mar 24 16:20:15 2008 +0100
+++ b/tests/test-issue619.out	Mon Mar 24 10:01:05 2008 -0500
@@ -6,5 +6,5 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 bogus fast-forward should fail
-abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
+abort: can't merge with ancestor
 done