| private Merge_TheyEditWeDoNothing_GetTheirs ( ) : void | ||
| return | void | |
public void Merge_TheyEditWeDoNothing_GetTheirs()
{
const string common = @"<html><head></head><body><div class='bloom-page' id='1'></div></body></html>";
const string theirs = @"<html><head></head><body><div class='bloom-page' id='1'>hello</div></body></html>";
const string ours = common;
var result = DoMerge(common, ours, theirs);
Assert.IsTrue(result.resultString.Contains("hello"));
result.listener.AssertExpectedConflictCount(0);
result.listener.AssertExpectedChangesCount(1);
}
