Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 12044)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 12046)
@@ -12,5 +12,7 @@
 
 import javax.swing.ImageIcon;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 
@@ -98,20 +100,20 @@
         propertiesMerger.setName("panel.propertiesmerger");
         propertiesMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Properties"), propertiesMerger);
+        addTab(tr("Properties"), propertiesMerger);
 
         tagMerger = new TagMerger();
         tagMerger.setName("panel.tagmerger");
         tagMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Tags"), tagMerger);
+        addTab(tr("Tags"), tagMerger);
 
         nodeListMerger = new NodeListMerger();
         nodeListMerger.setName("panel.nodelistmerger");
         nodeListMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Nodes"), nodeListMerger);
+        addTab(tr("Nodes"), nodeListMerger);
 
         relationMemberMerger = new RelationMemberMerger();
         relationMemberMerger.setName("panel.relationmembermerger");
         relationMemberMerger.getModel().addPropertyChangeListener(this);
-        tabbedPane.add(tr("Members"), relationMemberMerger);
+        addTab(tr("Members"), relationMemberMerger);
 
         setLayout(new BorderLayout());
@@ -122,4 +124,9 @@
         conflictResolvers.add(nodeListMerger);
         conflictResolvers.add(relationMemberMerger);
+    }
+
+    private void addTab(String title, JComponent tabContent) {
+        JScrollPane scrollPanel = new JScrollPane(tabContent);
+        tabbedPane.add(title, scrollPanel);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 12044)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 12046)
@@ -102,5 +102,5 @@
         HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
-        setContent(p);
+        setContent(p, false);
     }