diff options
| author | Andre Weinand | 2004-04-30 16:15:49 +0000 |
|---|---|---|
| committer | Andre Weinand | 2004-04-30 16:15:49 +0000 |
| commit | 95fb880b83e598f5ba3870bd9b8f678396d3fdbc (patch) | |
| tree | 2fdaf3a97bdad1250fb0dded7f62ddc7e8e8d31c /bundles/org.eclipse.compare/compare | |
| parent | 5a233cb177dc44023f2c24cf0601b37577ef13e3 (diff) | |
| download | eclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.tar.gz eclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.tar.xz eclipse.platform.team-95fb880b83e598f5ba3870bd9b8f678396d3fdbc.zip | |
work on "Copy All Non-conflicting..." problem
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index ebff2b89e..384cdafb5 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -236,7 +236,7 @@ public class TextMergeViewer extends ContentMergeViewer { private boolean fUseSplines= true; private boolean fUseSingleLine= true; - private boolean fUseResolveUI= fUseSingleLine; // resolve UI only for single lines private boolean fShowSummeryIcon; + private boolean fUseResolveUI= true; private String fSymbolicFontName; @@ -681,7 +681,6 @@ public class TextMergeViewer extends ContentMergeViewer { fShowPseudoConflicts= fPreferenceStore.getBoolean(ComparePreferencePage.SHOW_PSEUDO_CONFLICTS); //fUseSplines= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SPLINES); fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE); - fUseResolveUI= fUseSingleLine; //fUseResolveUI= fPreferenceStore.getBoolean(ComparePreferencePage.USE_RESOLVE_UI); } @@ -3005,7 +3004,7 @@ public class TextMergeViewer extends ContentMergeViewer { } else if (key.equals(ComparePreferencePage.USE_SINGLE_LINE)) { fUseSingleLine= fPreferenceStore.getBoolean(ComparePreferencePage.USE_SINGLE_LINE); - fUseResolveUI= fUseSingleLine; +// fUseResolveUI= fUseSingleLine; fBasicCenterCurve= null; updateResolveStatus(); invalidateLines(); |