diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-18 12:20:54 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-18 12:20:54 +0300 |
| commit | cb1a77e281e838e4a3a4947f99522f6673843cc4 (patch) | |
| tree | 477d831eed3fc81002f4612e80491074723a61ce /main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | |
| parent | 4c38da6df23c6dbb543a89d2b2977d6cf20d48e3 (diff) | |
[VCS] Fix tests and make all diffs not include eol in diffing.
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 | 4 |
1 files changed, 2 insertions, 2 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 02e20fc3f4..4998d00663 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 @@ -173,8 +173,8 @@ namespace MonoDevelop.VersionControl.Views public override void UpdateDiff () { - LeftDiff = new List<Hunk> (editors[0].Document.Diff (MainEditor.Document)); - RightDiff = new List<Hunk> (editors[2].Document.Diff (MainEditor.Document)); + LeftDiff = new List<Hunk> (editors[0].Document.Diff (MainEditor.Document, includeEol: false)); + RightDiff = new List<Hunk> (editors[2].Document.Diff (MainEditor.Document, includeEol: false)); DocumentLine line; LeftDiff.RemoveAll (item => null != (line = MainEditor.Document.GetLine (item.InsertStart)) && |