[PATCH 5 of 5] merge.mergestate: expose branch merge info via a method

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1446520194 28800
#      Mon Nov 02 19:09:54 2015 -0800
# Node ID d9413cf14bb6ce9c6abcde766e3e73893702c0d1
# Parent  61c764167bb79d23f6798a2d8352be38a5833770
merge.mergestate: expose branch merge info via a method

This will be used by upcoming patches that need to use this for change/delete
situations.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -256,6 +256,9 @@ class mergestate(object):
     def otherctx(self):
         return self._repo[self._other]
 
+    def branchmerge(self):
+        return self._branchmerge
+
     def active(self):
         """Whether mergestate is active.