1 files changed, 15 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
index 3210ffbaf..73a16661a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
@@ -13,6 +13,7 @@ package org.eclipse.team.internal.ui.synchronize;
 import java.io.InputStream;
 
 import org.eclipse.compare.*;
+import org.eclipse.core.resources.IEncodedStorage;
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.*;
 import org.eclipse.swt.graphics.Image;
@@ -23,7 +24,7 @@ import org.eclipse.team.internal.core.Assert;
 /**
  * RemoteResourceTypedElement
  */
-public class RemoteResourceTypedElement extends BufferedContent implements ITypedElement, IEditableContent {
+public class RemoteResourceTypedElement extends BufferedContent implements ITypedElement, IEditableContent, IEncodedStreamContentAccessor {
 
 	private IResourceVariant remote;
 	private IStorage bufferedContents;
@@ -125,4 +126,17 @@ public class RemoteResourceTypedElement extends BufferedContent implements IType
 		remote = variant;
 		fireContentChanged();
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
+	 */
+	public String getCharset() throws CoreException {
+		if(bufferedContents == null) {
+			cacheContents(new NullProgressMonitor());
+		}
+		if (bufferedContents instanceof IEncodedStorage) {
+			return ((IEncodedStorage)bufferedContents).getCharset();
+		}
+		return null;
+	}
 }
 \ No newline at end of file