# HG changeset patch
# User Simon Farnsworth <simonfar@fb.com>
# Date 1456513990 0
# Node ID 5408e532e50a51974e2e8c9ff91792e56a387db4
# Parent  de8b09482fb7e83704ba2d3074e417ad39dbe669
merge: fix error message

Obvious copy-and-paste error

diff -r de8b09482fb7 -r 5408e532e50a mercurial/merge.py
--- 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):