diff -r 00a0ab08f986 -r d68ddccf276b mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sun May 08 23:27:48 2011 +0200
+++ b/mercurial/cmdutil.py	Tue May 10 16:08:46 2011 -0500
@@ -78,7 +78,7 @@
 
     return p
 
-def bail_if_changed(repo):
+def bailifchanged(repo):
     if repo.dirstate.p2() != nullid:
         raise util.Abort(_('outstanding uncommitted merge'))
     modified, added, removed, deleted = repo.status()[:4]