1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java
index 82ebf620a..b8a7bfde4 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java
@@ -50,6 +50,11 @@ public class ResourceAttachmentChangeMerger extends AbstractMerger {
 		return target instanceof ResourceAttachmentChange;
 	}
 
+	@Override
+	public boolean apply(IMergeCriterion criterion) {
+		return criterion == null;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 * 
@@ -273,12 +278,15 @@ public class ResourceAttachmentChangeMerger extends AbstractMerger {
 			return;
 		}
 
-		final EObject sourceValue;
+		EObject sourceValue;
 		if (rightToLeft) {
 			sourceValue = match.getRight();
 		} else {
 			sourceValue = match.getLeft();
 		}
+		if (sourceValue == null) {
+			sourceValue = match.getOrigin();
+		}
 
 		final EObject expectedValue;
 		if (rightToLeft) {