public MergeOrder( string pathToOurs, string pathToCommon, string pathToTheirs,
MergeSituation situation)
{
this.pathToOurs = pathToOurs;
this.pathToTheirs = pathToTheirs;
MergeSituation = situation;
pathToCommonAncestor = pathToCommon;
// ConflictHandlingMode = mode;
EventListener = new NullMergeEventListener();//client can put something useful in if it needs one
}
public XmlMerger(MergeSituation mergeSituation)
{
MergeSituation = mergeSituation;
EventListener = new NullMergeEventListener();
MergeStrategies = new MergeStrategies();
}
public XmlMerger(MergeSituation mergeSituation)
{
MergeSituation = mergeSituation;
EventListener = new NullMergeEventListener();
MergeStrategies = new MergeStrategies();
}
