Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 2939)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 2940)
@@ -65,4 +65,6 @@
     private boolean myVisibleState;
     private boolean theirVisibleState;
+    private List<OsmPrimitive> myReferrers;
+    private List<OsmPrimitive> theirReferrers;
     private MergeDecisionType deletedMergeDecision;
     private MergeDecisionType visibleMergeDecision;
@@ -175,4 +177,7 @@
         theirVisibleState = their.isVisible();
 
+        myReferrers = my.getReferrers();
+        theirReferrers = their.getReferrers();
+
         coordMergeDecision = UNDECIDED;
         deletedMergeDecision = UNDECIDED;
@@ -270,4 +275,20 @@
     public  Boolean getTheirVisibleState() {
         return theirVisibleState;
+    }
+
+    /**
+     * returns my referrers,
+     * @return my referrers
+     */
+    public List<OsmPrimitive> getMyReferrers() {
+        return myReferrers;
+    }
+
+    /**
+     * returns their referrers,
+     * @return their referrers
+     */
+    public List<OsmPrimitive> getTheirReferrers() {
+        return theirReferrers;
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 2939)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 2940)
@@ -10,4 +10,5 @@
 import java.awt.event.ActionEvent;
 import java.text.DecimalFormat;
+import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
@@ -22,4 +23,6 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -54,4 +57,7 @@
     private JLabel lblTheirVisibleState;
 
+    private JLabel lblMyReferrers;
+    private JLabel lblTheirReferrers;
+
     private final PropertiesMergeModel model;
 
@@ -162,5 +168,4 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(0,5,20,5);
         UndecideCoordinateConflictAction actUndecideCoordinates = new UndecideCoordinateConflictAction();
         model.addObserver(actUndecideCoordinates);
@@ -319,4 +324,35 @@
         btnUndecideVisibleState.setName("button.undecidevisiblestate");
         add(btnUndecideVisibleState, gc);
+    }
+
+    protected void buildReferrersRow() {
+        GridBagConstraints gc = new GridBagConstraints();
+
+        gc.gridx = 0;
+        gc.gridy = 7;
+        gc.gridwidth = 1;
+        gc.gridheight = 1;
+        gc.fill = GridBagConstraints.BOTH;
+        gc.anchor = GridBagConstraints.LINE_START;
+        gc.weightx = 0.0;
+        gc.weighty = 0.0;
+        gc.insets = new Insets(0,5,0,5);
+        add(new JLabel(tr("Referenced by:")), gc);
+
+        gc.gridx = 1;
+        gc.gridy = 7;
+        gc.fill = GridBagConstraints.BOTH;
+        gc.anchor = GridBagConstraints.CENTER;
+        gc.weightx = 0.33;
+        gc.weighty = 0.0;
+        add(lblMyReferrers = buildValueLabel("label.myreferrers"), gc);
+
+        gc.gridx = 5;
+        gc.gridy = 7;
+        gc.fill = GridBagConstraints.BOTH;
+        gc.anchor = GridBagConstraints.CENTER;
+        gc.weightx = 0.33;
+        gc.weighty = 0.0;
+        add(lblTheirReferrers = buildValueLabel("label.theirreferrers"), gc);
     }
 
@@ -327,4 +363,5 @@
         buildDeletedStateConflictRows();
         buildVisibleStateRows();
+        buildReferrersRow();
     }
 
@@ -372,4 +409,15 @@
         else
             return tr("Physically delete from local dataset");
+    }
+
+    public String referrersToString(List<OsmPrimitive> referrers) {
+        if (referrers.isEmpty())
+            return tr("(none)");
+        String str = "<html>";
+        for (OsmPrimitive r: referrers) {
+            str = str + r.getDisplayName(DefaultNameFormatter.getInstance()) + "<br>";
+        }
+        str = str + "</html>";
+        return str;
     }
 
@@ -457,8 +505,16 @@
     }
 
+    protected void updateReferrers() {
+        lblMyReferrers.setText(referrersToString(model.getMyReferrers()));
+        lblMyReferrers.setBackground(BGCOLOR_NO_CONFLICT);
+        lblTheirReferrers.setText(referrersToString(model.getTheirReferrers()));
+        lblTheirReferrers.setBackground(BGCOLOR_NO_CONFLICT);
+    }
+
     public void update(Observable o, Object arg) {
         updateCoordinates();
         updateDeletedState();
         updateVisibleState();
+        updateReferrers();
     }