Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 4115)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 4116)
@@ -54,5 +54,5 @@
     private MergeDecisionType deletedMergeDecision;
     private final PropertyChangeSupport support;
-    private boolean resolvedCompletely;
+    private Boolean resolvedCompletely;
 
     public void addPropertyChangeListener(PropertyChangeListener listener) {
@@ -65,5 +65,5 @@
 
     public void fireCompletelyResolved() {
-        boolean oldValue = resolvedCompletely;
+        Boolean oldValue = resolvedCompletely;
         resolvedCompletely = isResolvedCompletely();
         support.firePropertyChange(RESOLVED_COMPLETELY_PROP, oldValue, resolvedCompletely);
@@ -74,5 +74,5 @@
         deletedMergeDecision = UNDECIDED;
         support = new PropertyChangeSupport(this);
-        resolvedCompletely = false;
+        resolvedCompletely = null;
     }
 
@@ -146,8 +146,5 @@
         setChanged();
         notifyObservers();
-        /* 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();
+        fireCompletelyResolved();
     }