protected override TextDocument DoMerge(TextDocument origin, TextDocument left, TextDocument right, ConflictResolutionOptions options) { string text = textMergeHandler.Merge(origin.Text, left.Text, right.Text, options); var meta = metadataHandler.Merge(origin.Metadata, left.Metadata, right.Metadata, options); return(new TextDocument(text, meta)); }
protected override string DoMerge(string origin, string left, string right, ConflictResolutionOptions options) { return(_strategy.Merge(origin, left, right, options)); }