diff options
| author | Mike Krüger <mkrueger@novell.com> | 2010-08-09 16:17:14 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2010-08-09 16:17:53 +0400 |
| commit | 235348496ee8e4189feea9aca38a5d7b43f7160c (patch) | |
| tree | e16316691e7965c147533ab772b913159a280f57 /main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs | |
| parent | c657333d53ed6bc042b690ec26653fc1c42ef1f0 (diff) | |
Added sub line 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 | 1 |
1 files changed, 1 insertions, 0 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 95ad444fcd..a108000e23 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 @@ -179,6 +179,7 @@ namespace MonoDevelop.VersionControl.Views leftDiff.Add (new Mono.TextEditor.Utils.Hunk (left.RemoveStart, middleA, left.Removed, middleB - middleA)); rightDiff.Add (new Mono.TextEditor.Utils.Hunk (right.RemoveStart, middleA, right.Removed, middleB - middleA)); } + base.UpdateDiff (); QueueDraw (); } |