Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 19678)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 19686)
@@ -293,4 +293,6 @@
                 return;
             int row = table.rowAtPoint(e.getPoint());
+            if (row < 0) // see #25019
+                return;
             model.decide(row, mergeDecision);
         }
