Attachment 154483 Details for Bug 287421 – Fix v01

[patch] Fix v01

clipboard.txt (text/plain), 1.05 KB, created by Tomasz Zarna

on 2009-12-15 10:13:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-12-15 10:13:21 EST

Size: 1.05 KB

patch

obsolete

>### 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);
> 							}
> 						}
> 					}

Actions: View | Diff

Attachments on bug 287421: 154483 | 154484