Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java
AgeCommit message (Expand)AuthorFilesLines
2019-04-17Remove useless non-javadoc/@see comments. (take 3)Alexander Kurtakov1-3/+0
2018-08-27Bug 535802 - EPL 2.0 conversion for team bundlesLars Vogel1-3/+6
2016-04-12Bug 491533 - Run remove unnecessary whitespace cleanup onY20160414-1000I20160417-1112Lars Vogel1-2/+2
2016-04-12Bug 491484 - Add @Override to org.eclipse.team.ui Lars Vogel1-0/+1
2006-03-29Updated copyrightsMichael Valenta1-2/+2
2006-01-31Cleaned up MergeContextMichael Valenta1-43/+2
2006-01-30Renamed IDiffNode to IDiffMichael Valenta1-6/+6
2006-01-30Bug 125662 mark package as internalMichael Valenta1-0/+7
2005-12-16Bug 118225 [Merge API] Model mergers with additional UIMichael Valenta1-1/+1
2005-12-14Refactored API a bitMichael Valenta1-0/+1
2005-12-09Bug 120052 Create an IResourceDiffTreeMichael Valenta1-1/+1
2005-12-06Renamed some interfacesI20051205Michael Valenta1-6/+6
2005-12-05Renamed delta classes and interfacesMichael Valenta1-6/+6
2005-12-05Moved a bunch of stuff into Team CoreMichael Valenta1-2/+1
2005-12-05Improve change desciption APIMichael Valenta1-17/+15
2005-10-28Bug 113901 [Merge API] Ue adaptble mechanism for default model mergerMichael Valenta1-6/+6
2005-10-28Tidied up scope API a bitMichael Valenta1-2/+2
2005-10-28Refactored a bitMichael Valenta1-9/+7
2005-10-24Tidying up the content providersMichael Valenta1-3/+3
2005-10-21Moving logical model support work to HEAD in preparation for 3.2 M3Michael Valenta1-0/+74

    Back to the top