Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 5287)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 5288)
@@ -254,4 +254,14 @@
         }
         updateResolvedCompletely();
+        selectFirstTabWithConflicts();
+    }
+    
+    public void selectFirstTabWithConflicts() {
+        for (int i = 0; i < tabbedPane.getTabCount(); i++) {
+            if (tabbedPane.isEnabledAt(i) && mergeIncomplete.equals(tabbedPane.getIconAt(i))) {
+                tabbedPane.setSelectedIndex(i);
+                break;
+            }
+        }
     }