sw_redlinehide_2: also reset Merge flag in CheckParaRedlineMerge

If it sets the Merge flag, it needs to reset it too.

Change-Id: I0b07ca87ff9911db37166312ca07edd15e8b496c

sw/source/core/text/redlnitr.cxx

@@ -102,6 +102,10 @@ CheckParaRedlineMerge(SwTextFrame & rFrame, SwTextNode & rTextNode,
     }
     if (!bHaveRedlines)
     {
+        if (pNode->GetRedlineMergeFlag() != SwNode::Merge::None)
+        {
+            pNode->SetRedlineMergeFlag(SwNode::Merge::None);
+        }
         return nullptr;
     }
     if (nLastEnd != pNode->Len())