diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2017-05-15 17:12:12 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2017-05-16 17:47:17 +0300 |
| commit | 30c5a9db7f234d93c1c6f4e60367276d3576aa93 (patch) | |
| tree | 4a175041982994375d4ab8d46ba1a7490acb66c8 /main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | |
| parent | 709ab92f3fc7b490e4826f818e5b44ba1864a98c (diff) | |
[VCS] Don't set tabs to spaces due to default policy in the diff editor.
When setting the local text, the text setter would end up formatting the tabs to spaces due to how the policy was set. Disable that setting.
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; |