Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix error message
authorSimon Farnsworth <simonfar@fb.com>
Fri, 26 Feb 2016 19:13:10 +0000
changeset 28267 5408e532e50a
parent 28266 de8b09482fb7
child 28268 3643b66d7f71
merge: fix error message Obvious copy-and-paste error
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Wed Feb 24 23:00:33 2016 +0900
+++ b/mercurial/merge.py	Fri Feb 26 19:13:10 2016 +0000
@@ -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):
Mercurial