--- a/Tools__ChangeList.st	Sat Mar 30 02:58:47 2013 +0100
+++ b/Tools__ChangeList.st	Sat Mar 30 02:59:17 2013 +0100
@@ -244,6 +244,11 @@
                   translateLabel: true
                 )
                (MenuItem
+                  label: 'Select conflicts (redefined classes/methods)'
+                  itemValue: listMenuSelectConflicts
+                  translateLabel: true
+                )
+               (MenuItem
                   label: 'Select additions (new classes/methods)'
                   itemValue: listMenuSelectAdditions
                   translateLabel: true
@@ -1116,11 +1121,11 @@
 !ChangeList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.21 2013-03-30 01:59:17 cg Exp $'
 !
 
 version_SVN