--- a/tests/test-merge-tools.t	Mon Jan 14 10:17:06 2013 -0600
+++ b/tests/test-merge-tools.t	Tue Jan 15 01:05:11 2013 +0100
@@ -843,6 +843,7 @@
   $ hg commit -qm 'f is symlink'
   $ hg merge -r 2 --tool internal:merge
   merging f
+  warning: internal:merge cannot merge symlinks for f
   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
   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