void IMergeViewLauncher.MergeFrom(ObjectInfo objectInfo, EnumMergeType mergeType, ShowIncomingChangesFrom from)
{
((IMergeViewLauncher)this).MergeFromInterval(objectInfo, null, mergeType);
}
void IMergeViewLauncher.MergeFromInterval(ObjectInfo objectInfo, ObjectInfo ancestorChangesetInfo, EnumMergeType mergeType)
{
if (mergeType == EnumMergeType.IncomingMerge)
{
ShowIncomingChangesView();
mParentWindow.Repaint();
return;
}
LaunchTool.OpenMerge(mWkInfo.ClientPath);
}
void IMergeViewLauncher.MergeFrom(ObjectInfo objectInfo, EnumMergeType mergeType)
{
((IMergeViewLauncher)this).MergeFromInterval(objectInfo, null, mergeType);
}