--- a/mercurial/wireproto.py	Sat Jun 07 11:32:37 2014 -0400
+++ b/mercurial/wireproto.py	Tue May 27 14:45:31 2014 -0700
@@ -507,7 +507,7 @@
             opts[k] = others[k]
             del others[k]
     if others:
-        sys.stderr.write("abort: %s got unexpected arguments %s\n"
+        sys.stderr.write("warning: %s ignored unexpected arguments %s\n"
                          % (cmd, ",".join(others)))
     return opts