private MergeResult DoMerge(string commonAncestor, string ourContent, string theirContent) { var result = new MergeResult(); using (var ours = new TempFile(ourContent)) using (var theirs = new TempFile(theirContent)) using (var ancestor = new TempFile(commonAncestor)) { var situation = new NullMergeSituation(); var mergeOrder = new MergeOrder(ours.Path, ancestor.Path, theirs.Path, situation); result.listener = new ListenerForUnitTests(); mergeOrder.EventListener = result.listener; new BloomHtmlFileTypeHandler().Do3WayMerge(mergeOrder); result.resultString = File.ReadAllText(ours.Path); } return(result); }
private MergeResult DoMerge(string commonAncestor, string ourContent, string theirContent) { var result = new MergeResult(); using (var ours = new TempFile(ourContent)) using (var theirs = new TempFile(theirContent)) using (var ancestor = new TempFile(commonAncestor)) { var situation = new NullMergeSituation(); var mergeOrder = new MergeOrder(ours.Path, ancestor.Path, theirs.Path, situation); result.listener = new ListenerForUnitTests(); mergeOrder.EventListener = result.listener; new BloomHtmlFileTypeHandler().Do3WayMerge(mergeOrder); result.resultString = File.ReadAllText(ours.Path); } return result; }