### Eclipse Workspace Patch 1.0 #P org.eclipse.compare 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.267 diff -u -r1.267 TextMergeViewer.java --- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 7 Dec 2009 16:04:51 -0000 1.267 +++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 15 Dec 2009 15:10:50 -0000 @@ -2308,9 +2308,8 @@ fCenterButton.setVisible(false); if (fButtonDiff != null) { setCurrentDiff(fButtonDiff, false); - copy(fCurrentDiff, - fCenterButton.getText().equals(COPY_LEFT_TO_RIGHT_INDICATOR), - fCurrentDiff.getKind() != RangeDifference.CONFLICT); + copy(fCurrentDiff, fCenterButton.getText().equals( + COPY_LEFT_TO_RIGHT_INDICATOR), false); } } }