private static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
ConflictBlocks conflictBlocks = LoadBlocks();
var merger = new CustomMerger(conflictBlocks);
var presenter = new Presenter(merger);
var form = new MainForm(presenter);
Application.Run(form);
}
public CustomMerger(ConflictBlocks conflictBlocks) : base(conflictBlocks)
{
}
/// <summary>
/// Initializes a new instance of the <see cref="CustomMerger"/> class.
/// </summary>
/// <param name="conflictBlocks">The conflict blocks.</param>
public SimpleMerger(ConflictBlocks conflictBlocks)
{
ConflictBlocks = conflictBlocks;
}
