diff -r 1070df141718 -r 3c6893ba2d36 mercurial/merge.py
--- a/mercurial/merge.py	Thu Nov 10 02:19:16 2016 -0800
+++ b/mercurial/merge.py	Thu Nov 10 02:21:15 2016 -0800
@@ -18,6 +18,7 @@
     addednodeid,
     bin,
     hex,
+    modifiednodeid,
     nullhex,
     nullid,
     nullrev,
@@ -815,7 +816,7 @@
     if '.hgsubstate' in m1:
         # check whether sub state is modified
         if any(wctx.sub(s).dirty() for s in wctx.substate):
-            m1['.hgsubstate'] += '+'
+            m1['.hgsubstate'] = modifiednodeid
 
     # Compare manifests
     if matcher is not None: