@@ -17,6 +17,9 @@ namespace GitUI { InitializeComponent(); ThereWhereMergeConflicts = GitCommands.GitCommands.InTheMiddleOfConflictedMerge(); + + //Solve button is disabled for now + SolveConflictButton.Visible = false; } void ConflictedFiles_CellClick(object sender, DataGridViewCellEventArgs e) GitUI/FormResolveConflicts.cs 7851f2fbca3c244220c05dba518e94754944cce3 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/3d4557e09a98c2df1bf2a1f2c373d80191bb52f0 3d4557e09a98c2df1bf2a1f2c373d80191bb52f0 2009-11-04T10:22:22-08:00 2009-11-04T10:22:22-08:00 Hidden SolveConflictButton for now. 97bdb86b07f84b3d5c4071e7cf80c1569414cb55 Henk Westhuis Henk_Westhuis@hotmail.com