diff -r 2e48c776a874 -r b6a6df38a802 mercurial/merge.py
--- a/mercurial/merge.py	Sun Mar 12 16:26:34 2017 -0700
+++ b/mercurial/merge.py	Sun Mar 12 16:41:46 2017 -0700
@@ -1544,7 +1544,7 @@
                 raise error.Abort(_("merging with a working directory ancestor"
                                    " has no effect"))
             elif pas == [p1]:
-                if not mergeancestor and p1.branch() == p2.branch():
+                if not mergeancestor and wc.branch() == p2.branch():
                     raise error.Abort(_("nothing to merge"),
                                      hint=_("use 'hg update' "
                                             "or check 'hg heads'"))