# HG changeset patch
# User Simon Farnsworth <simonfar@fb.com>
# Date 2016-02-26 19:13:10
# Node ID 5408e532e50a51974e2e8c9ff91792e56a387db4
# Parent  de8b09482fb7e83704ba2d3074e417ad39dbe669

merge: fix error message

Obvious copy-and-paste error

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -311,7 +311,7 @@ class mergestate(object):
     @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):