### Eclipse Workspace Patch 1.0
#P org.eclipse.compare
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/META-INF/MANIFEST.MF,v
retrieving revision 1.28
diff -u -r1.28 MANIFEST.MF
--- META-INF/MANIFEST.MF	18 Jul 2011 07:35:49 -0000	1.28
+++ META-INF/MANIFEST.MF	26 Feb 2012 06:27:27 -0000
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare; singleton:=true
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.203.v20120226
 Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
Index: compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java,v
retrieving revision 1.82
diff -u -r1.82 ContentMergeViewer.java
--- compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	3 Dec 2010 09:45:59 -0000	1.82
+++ compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java	26 Feb 2012 06:27:28 -0000
@@ -1306,6 +1306,10 @@
 				}
 			}
 		}
+		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=312893
+		if (isSaving() && (isLeftDirty() || isRightDirty())) {
+			return; // Do not refresh until saving both sides is complete
+		}
 		refresh();
 	}
 
Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v
retrieving revision 1.271
diff -u -r1.271 TextMergeViewer.java
--- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	10 Aug 2010 10:23:04 -0000	1.271
+++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java	26 Feb 2012 06:27:31 -0000
@@ -817,7 +817,7 @@
 
 				newDoc= new Document(s != null ? s : ""); //$NON-NLS-1$
 			}
-			return newDoc;
+			return customizeDocument(newDoc);
 		}
 
 		/**
@@ -5324,4 +5324,14 @@
 		getCompareConfiguration().setProperty(key, null);
 	}
 
+	/**
+	 * Create custom document for the client
+	 * 
+	 * @param document
+	 * @return custom document
+	 */
+	protected IDocument customizeDocument(IDocument document) {
+		return document;
+	}
+
 }
