diff options
| author | Michael Valenta | 2005-10-20 20:32:15 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-10-20 20:32:15 +0000 |
| commit | 6e906f0d75b627fd373e4a0cc76c33258cf9e1c7 (patch) | |
| tree | b03e9d12f921955633d32bd212886b33a2e522fc | |
| parent | 7c9145e2fb96897d18b3e967c4cf308ffd45a828 (diff) | |
| download | eclipse.platform.team-6e906f0d75b627fd373e4a0cc76c33258cf9e1c7.tar.gz eclipse.platform.team-6e906f0d75b627fd373e4a0cc76c33258cf9e1c7.tar.xz eclipse.platform.team-6e906f0d75b627fd373e4a0cc76c33258cf9e1c7.zip | |
*** empty log message ***
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeContext.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeContext.java index 131be8da6..0054eace5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeContext.java @@ -61,6 +61,8 @@ import org.eclipse.team.internal.ui.TeamUIPlugin; */ public abstract class MergeContext extends TeamViewerContext implements IMergeContext { + private static final String TXT_EXTENTION = "txt"; //$NON-NLS-1$ + private final String type; private final SyncInfoTree tree; @@ -270,7 +272,7 @@ public abstract class MergeContext extends TeamViewerContext implements IMergeCo // If we couldn't find a registered merger, fallback to text // since we know we have one of those registered. if (merger == null) - merger = CompareUI.createStreamMerger(TextStreamMerger.EXTENTION); + merger = CompareUI.createStreamMerger(TXT_EXTENTION); if (merger == null) return new Status(IStatus.ERROR, TeamPlugin.ID, MergeStatus.INTERNAL_ERROR, NLS.bind("Auto-merge support for {0} is not available.", new String[] { file.getFullPath().toString() }), null); return merge(merger, info, monitor); |