Mercurial > hg-stable
diff mercurial/cmdutil.py @ 14289:d68ddccf276b
cmdutil: bail_if_changed to bailifchanged
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 May 2011 16:08:46 -0500 |
parents | 66257848c154 |
children | 86e70956da4f |
line wrap: on
line diff
--- 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]