Submitter | Simon Farnsworth |
---|---|
Date | Feb. 26, 2016, 10:53 p.m. |
Message ID | <94877fdaa4df909b6ad2.1456527232@SimonFar-MacBookPro.local> |
Download | mbox | patch |
Permalink | /patch/13427/ |
State | Accepted |
Delegated to: | Yuya Nishihara |
Headers | show |
Comments
On Fri, 26 Feb 2016 22:53:52 +0000, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth <simonfar@fb.com> > # Date 1456513990 0 > # Fri Feb 26 19:13:10 2016 +0000 > # Node ID 94877fdaa4df909b6ad2ad25c3cc79902899dda2 > # Parent 41dcd754526612c43b9695df8851557c851828ef > merge: fix error message > > Obvious copy-and-paste error Sure, pushed to the clowncopter, thanks.
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -311,7 +311,7 @@ @util.propertycache def otherctx(self): if self._other is None: - raise RuntimeError("localctx accessed but self._local isn't set") + raise RuntimeError("otherctx accessed but self._other isn't set") return self._repo[self._other] def active(self):