Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java
AgeCommit message (Expand)AuthorFilesLines
2018-10-30Lambda conversions.Alexander Kurtakov1-6/+7
2018-08-27Bug 535802 - EPL 2.0 conversion for team bundlesLars Vogel1-3/+6
2006-03-29Updated copyrightsMichael Valenta1-2/+2
2006-01-07Bug 114661 [Merge API] CVS Merge should use IResourceMappingMergerMichael Valenta1-1/+2
2005-02-22Changing to EPLMichael Valenta1-4/+4
2005-02-11Bug 84604 Merge, Keyword Mode and ResourceMappingMichael Valenta1-2/+2
2004-12-11Bug 74660 Key Bindings for Team Plug-in ActionsJean Michel-Lemieux1-1/+8
2004-11-22Bug 13460 [CVS UI] Ability to filter out unwanted CVS tags in UIMichael Valenta1-3/+2
2003-03-10Fix copyrights - automated changesDean Roberts1-6/+6
2002-11-1225865: Packages/Team/Commit disabled on some multi-selections.Michael Valenta1-1/+0
2002-10-1721003: [CVS UI] Team->Update error if you select a project and its contentsRoot_MV_RepoViewReworkMichael Valenta1-6/+1
2002-09-0321281: [CVS UI] CVS Use causes stack dumpMichael Valenta1-1/+1
2002-05-02Bug 88: Save modified files before release (1GE7K8N)Jean Michel-Lemieux1-2/+3
2002-04-18Bug 7327: "Add to workspace" from history doesn't update revision # Jean Michel-Lemieux1-11/+13
2002-03-14Integrating new team.core APIJean Michel-Lemieux1-6/+0
2002-01-258178: Need merge functionalityjames1-0/+44

    Back to the top