# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1191969884 18000
# Node ID be015f9b740521efa67d72fb0f798188a9f37a73
# Parent  f9c2917a9f7a4b5f59e78e289fdc00445e6b0961# Parent  0d154bce23419132d246b2b20b234216a47f48d8
Merge with crew

diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -587,7 +587,7 @@ class queue:
             top = revlog.bin(self.applied[-1].rev)
             pp = repo.dirstate.parents()
             if top not in pp:
-                raise util.Abort(_("queue top not at same revision as working directory"))
+                raise util.Abort(_("working directory revision is not qtip"))
             return top
         return None
     def check_localchanges(self, repo, force=False, refresh=True):
diff --git a/mercurial/merge.py b/mercurial/merge.py