diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index 900ccea9a7..6cc8623715 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -470,7 +470,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa } InternalCDOSession session = getSession(); - MergeData mergeData = session.getMergeData(target, source, sourceBase); + MergeData mergeData = session.getMergeData(target, source, sourceBase, true); CDOChangeSet targetChanges = mergeData.getTargetChanges(); CDOChangeSet sourceChanges = mergeData.getSourceChanges(); |