diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java')
| -rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 778f5df33..5e83db18a 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -2586,14 +2586,14 @@ public class TextMergeViewer extends ContentMergeViewer { if (hasIncoming) { if (unresolved) { if (fNOTOKImage == null) { - ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/NOT_OK.gif"); //$NON-NLS-1$ + ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/unresolved.gif"); //$NON-NLS-1$ if (id != null) fNOTOKImage= id.createImage(fSummaryCanvas.getDisplay()); } c= fNOTOKImage; } else { if (fOKImage == null) { - ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/OK.gif"); //$NON-NLS-1$ + ImageDescriptor id= CompareUIPlugin.getImageDescriptor("obj16/resolved.gif"); //$NON-NLS-1$ if (id != null) fOKImage= id.createImage(fSummaryCanvas.getDisplay()); } |