Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
AgeCommit message (Expand)Author
2019-04-09Merge branch 'new-service-model' into new-doc-modelLluis Sanchez
2019-04-09Merge remote-tracking branch 'xamarin/master-vnext' into new-service-modelLluis Sanchez
2019-04-01Fixes VSTS Bug 691624: [Feedback] Visual studio marks git conflictsMike Krüger
2019-02-15Track API changesLluis Sanchez
2017-05-15[VCS] Don't set tabs to spaces due to default policy in the diff editor.therzok
2016-09-20Merge branch 'master' into textmateMike Krüger
2016-09-20[VCS] Fix use after destroy of editor.therzok
2016-05-17[SourceEditor] Text editor control implementation is now internal.Mike Krüger
2016-05-17[SourceEditor] Unified text paste handler.Mike Krüger
2016-05-17[SourceEditor] Unified text document subsystems.Mike Krüger
2016-05-17[TextEditorTests] Track API changes.Mike Krüger
2016-01-26[VCS] Keep offsets when moving to Blame/Merge widget.therzok
2015-12-18[VCS] Fix tests and make all diffs not include eol in diffing.Marius Ungureanu
2015-02-20[TextEditor/Ide] Renamed various TextEditor classes. TextEditor nowMike Krüger
2014-07-01[VersionControl] Text Editor now uses the IDE editor options again.Mike Krüger
2014-06-27Merge branch 'master' into retina-editorMike Krüger
2014-06-17[VersionControl] Track API changes.Mike Krüger
2014-04-24Actually fix it now. TT_TTMarius Ungureanu
2014-04-24Revert "Fix build."Marius Ungureanu
2014-04-24Fix build.Marius Ungureanu
2014-04-24[VersionControl] Hide some API.Marius Ungureanu
2014-04-09[MergeWidget] Fix infinite loop.Marius Ungureanu
2013-08-20[Version Control Cleanup in Dialog and Views folders.Therzok
2012-04-12[TextEditor] Renamed LineSegment -> DocumentLine.Mike Krüger
2012-04-05[TextEditor] Renamed LineSegment.EndOffset toMike Krüger
2012-03-31[TextEditor] Fixed unit tests.Mike Krüger
2012-03-31[VersionControl] Track API changes.Mike Krüger
2012-03-31[TextEditor] Track TextLength change.Mike Krüger
2012-03-29Track API changes.Mike Krüger
2012-03-22Merge branch 'master' into newresolverMike Krüger
2012-03-21Workaround for #3801 - managed container subclasses leakMichael Hutchinson
2012-03-15[Text] Replaced some File.ReadAllText usages withMike Krüger
2012-03-11[TextEditor] Replaced ISegment with TextSegment struct.Mike Krüger
2012-03-11[TextEditor] Changed 'Document' to 'TextDocument' to prevent nameMike Krüger
2012-03-11[TextEditor] Renamed 'ReplaceEventArgs' to 'DocumentChangeEventArgs'Mike Krüger
2011-11-08Merge remote-tracking branch 'origin/master' into macgtkMichael Hutchinson
2011-10-29[VersionControl] MergeWidget should use source editor fontMichael Hutchinson
2011-10-27Fixed "Bug 1729 - Error in merge widget when quitting MD".Mike Krüger
2011-10-17[VersionControl] Fixed small memory leak.Mike Krüger
2011-03-29Fixed merge window.Mike Krüger
2010-08-22Transformed text editor line/column coordinate system.Mike Krüger
2010-08-17Added show diff functionality to the 'compare' view.Mike Krüger
2010-08-09Added sub line diffing.Mike Krüger
2010-08-09Added prev/next buttons & diff view that contains the comparison widget.Mike Krüger
2010-08-06Added method for getting the text resulting from the merge.Lluis Sanchez
2010-08-06Worked on merge view.Mike Krüger
2010-08-05Allow reusing the MergeWidget in other projects.Lluis Sanchez
2010-08-05Use load methods instead of constructors.Mike Krüger
2010-08-05Added constructor that takes a file name.Mike Krüger
2010-08-05Removed old diff algorithm.Mike Krüger
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 16:29:32 +0300