refs/heads/change/9004/1 - platform/eclipse.platform.team

commit: bf225ea8f252cddb2686012f4c44cc8040d627d2
[log] [tgz]
author: Jeremy Flicker <jflicke@us.ibm.com>
Wed Nov 28 12:03:52 2012 +0100
committer: Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com>
Wed Apr 03 10:20:50 2013 +0200
tree: 8e9697e52038851be88397e355ac07a109fa10ed
parent: 41435564a99c604566f10591e675ce10072b8133 [diff]

Bug 382427 - Mechanism to inject line compare strategies into merge and
structure viewers

Change-Id: Iec597bd9582933b90f67de94547b4ccdaef9a319

bundles/org.eclipse.compare/META-INF/MANIFEST.MF[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/ICompareStrategy.java[Added - diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ChangeCompareStrategyPropertyAction.java[Added - diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareStrategyDescriptor.java[Added - diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator3.java[Added - diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureCreator.java[diff]
bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java[diff]
bundles/org.eclipse.compare/plugin.xml[diff]
bundles/org.eclipse.compare/schema/compareStrategies.exsd[Added - diff]
bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java[diff]
bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java[diff]

19 files changed

tree: 8e9697e52038851be88397e355ac07a109fa10ed

bundles/
examples/
features/
tests/
.gitignore
pom.xml