diff options
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs')
-rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index ab9c7898d6..02e20fc3f4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.VersionControl.Views { public class MergeWidget : EditorCompareWidgetBase { - protected override TextEditor MainEditor { + protected override MonoTextEditor MainEditor { get { return editors != null && editors.Length >= 2 ? editors[1] : null; } @@ -49,7 +49,7 @@ namespace MonoDevelop.VersionControl.Views MainEditor.Document.TextReplaced += UpdateConflictsOnTextReplace; } - protected override void UndoChange (TextEditor fromEditor, TextEditor toEditor, Hunk hunk) + protected override void UndoChange (MonoTextEditor fromEditor, MonoTextEditor toEditor, Hunk hunk) { base.UndoChange (fromEditor, toEditor, hunk); int i = leftConflicts.IndexOf (hunk); @@ -100,9 +100,9 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { this.editors = new [] { - new TextEditor (new TextDocument (), new CommonTextEditorOptions ()), - new TextEditor (new TextDocument (), new CommonTextEditorOptions ()), - new TextEditor (new TextDocument (), new CommonTextEditorOptions ()), + new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), + new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), + new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), }; this.editors[0].Document.ReadOnly = true; |