private static XmlNode DoMerge( string ancestorXml, string ourXml, string theirXml, MergeSituation mergeSituation, IMergeEventListener listener, out XmlNode ours, out XmlNode theirs) { var merger = new XmlMerger(mergeSituation) { EventListener = listener }; XmlNode ancestor; XmlNode ourParent; XmlTestHelper.CreateThreeNodes(ourXml, theirXml, ancestorXml, out ours, out ourParent, out theirs, out ancestor); ImmutableElementMergeService.DoMerge(merger, ourParent, ref ours, theirs, ancestor); return(ours); }
private static XmlNode DoMerge( string ancestorXml, string ourXml, string theirXml, MergeSituation mergeSituation, IMergeEventListener listener, out XmlNode ours, out XmlNode theirs) { var merger = new XmlMerger(mergeSituation) { EventListener = listener }; ours = CreateNode(ourXml); theirs = CreateNode(theirXml); var ancestorNode = CreateNode(ancestorXml); ImmutableElementMergeService.DoMerge(merger, ref ours, theirs, ancestorNode); return(ours); }