Changeset 1652 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-06-07T15:28:38+02:00 (16 years ago)

Author:

stoecker

Message:

make extended conflict resolving default

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -109 +109 @@
 
     private final void resolve() {
-        String method = Main.pref.get("conflict.resolution", "traditional");
+        String method = Main.pref.get("conflict.resolution", "extended");
         method = method.trim().toLowerCase();
         if (method.equals("traditional")) {