# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1151947149 25200
# Node ID 764a54eb8c5a155dc735bf9013b363c30fcf0a6f
# Parent  45235e492cc674812ea1e768174d3ea04e3bc3a3# Parent  0229ff95faec752bd19e2dbcc5ca4373ecf0458d
merge with crew.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1645,8 +1645,8 @@ class localrepository(object):
         linear_path = (pa == p1 or pa == p2)
 
         if allow and linear_path:
-            raise util.Abort(_("there is nothing to merge, "
-                               "just use 'hg update'"))
+            raise util.Abort(_("there is nothing to merge, just use "
+                               "'hg update' or look at 'hg heads'"))
         if allow and not forcemerge:
             if modified or added or removed:
                 raise util.Abort(_("outstanding uncommitted changes"))
diff --git a/tests/test-webraw b/tests/test-webraw
--- a/tests/test-webraw
+++ b/tests/test-webraw
@@ -17,4 +17,5 @@ sleep 5
 kill `cat hg.pid`
 sleep 1 # wait for server to scream and die
 cat getoutput.txt
-cat access.log error.log | sed 's/^\([^[]*\[\)[^]]*\(\].*\)$/\1date\2/g'
+cat access.log error.log | \
+  sed 's/^[^ ]*\( [^[]*\[\)[^]]*\(\].*\)$/host\1date\2/'
diff --git a/tests/test-webraw.out b/tests/test-webraw.out
--- a/tests/test-webraw.out
+++ b/tests/test-webraw.out
@@ -7,4 +7,4 @@ This is just some random text
 that will go inside the file and take a few lines.
 It is very boring to read, but computers don't
 care about things like that.
-localhost - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 -
+host - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 -