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 | 7 |
1 files changed, 4 insertions, 3 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 f15fbfb253..a4eb5f96ea 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 @@ -100,10 +100,11 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { + var options = GetTextEditorOptions (); this.editors = new [] { - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), + new MonoTextEditor (new TextDocument (), options), + new MonoTextEditor (new TextDocument (), options), + new MonoTextEditor (new TextDocument (), options), }; this.editors[0].Document.IsReadOnly = true; |