Default the merge to use content comparison.

1 files changed, 9 insertions, 9 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index 78074e0b6..9e651c008 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.team.core.TeamException;
+import org.eclipse.team.core.subscribers.ContentComparisonCriteria;
 import org.eclipse.team.core.subscribers.ITeamResourceChangeListener;
 import org.eclipse.team.core.subscribers.SyncInfo;
 import org.eclipse.team.core.subscribers.TeamDelta;
@@ -105,16 +106,15 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		String syncKeyPrefix = id.getLocalName();
 		remoteSynchronizer = new RemoteTagSynchronizer(syncKeyPrefix + end.getName(), end);
 		baseSynchronizer = new RemoteTagSynchronizer(syncKeyPrefix + start.getName(), start);
-		mergedSynchronizer = new RemoteSynchronizer(syncKeyPrefix + "0merged");
+		mergedSynchronizer = new RemoteSynchronizer(syncKeyPrefix + "0merged"); //$NON-NLS-1$
 		
-		// TODO: must use revision comparison until bugs 40035 and 40129 are addressed
-//		try {
-//			setCurrentComparisonCriteria(ContentComparisonCriteria.ID_IGNORE_WS);
-//		} catch (TeamException e) {
-//			// use the default but log an exception because the content comparison should
-//			// always be available.
-//			CVSProviderPlugin.log(e);
-//		}
+		try {
+			setCurrentComparisonCriteria(ContentComparisonCriteria.ID_IGNORE_WS);
+		} catch (TeamException e) {
+			// use the default but log an exception because the content comparison should
+			// always be available.
+			CVSProviderPlugin.log(e);
+		}
 		
 		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
 		CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().addListener(this);