Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 4114)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 4115)
@@ -146,5 +146,8 @@
         setChanged();
         notifyObservers();
-        fireCompletelyResolved();
+        /* call fire directly, to allow null as old value, otherwise the call can be
+           optimized away when resolvedCompletely is false. */
+        support.firePropertyChange(RESOLVED_COMPLETELY_PROP, null, resolvedCompletely);
+        //fireCompletelyResolved();
     }