diff options
2 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java index f2ca01139..9ffd3b18c 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java @@ -276,7 +276,7 @@ public class DiffNode extends DiffContainer implements ITypedElement, ICompareIn if (dstParent instanceof IEditableContent) {
ITypedElement dst= leftToRight ? getRight() : getLeft();
ITypedElement src= leftToRight ? getLeft() : getRight();
- //dst= ((IEditableContent)dstParent).replace(dst, src);
+ dst= ((IEditableContent)dstParent).replace(dst, src);
if (leftToRight)
setRight(dst);
else
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java index f2ca01139..9ffd3b18c 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java @@ -276,7 +276,7 @@ public class DiffNode extends DiffContainer implements ITypedElement, ICompareIn if (dstParent instanceof IEditableContent) {
ITypedElement dst= leftToRight ? getRight() : getLeft();
ITypedElement src= leftToRight ? getLeft() : getRight();
- //dst= ((IEditableContent)dstParent).replace(dst, src);
+ dst= ((IEditableContent)dstParent).replace(dst, src);
if (leftToRight)
setRight(dst);
else
|