--- 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):