--- a/mercurial/filemerge.py	Mon Jan 14 10:17:06 2013 -0600
+++ b/mercurial/filemerge.py	Tue Jan 15 01:05:11 2013 +0100
@@ -208,6 +208,8 @@
     the partially merged file."""
     tool, toolpath, binary, symlink = toolconf
     if symlink:
+        repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
+                       'for %s\n') % fcd.path())
         return False, 1
 
     r = _premerge(repo, toolconf, files)