#
#
# patch "options_list.hh"
#  from [1b07d8c2b93a24bddba2a87281a924aff6b9d621]
#    to [05dd95761e6fa1268a22ba28cda146765d6246b1]
#
============================================================
--- options_list.hh	1b07d8c2b93a24bddba2a87281a924aff6b9d621
+++ options_list.hh	05dd95761e6fa1268a22ba28cda146765d6246b1
@@ -450,7 +450,9 @@ OPT(bookkeep_only, "bookkeep-only", bool
 }
 #endif
 
-SIMPLE_OPTION(move_conflicting_paths, "move-conflicting-paths", bool,
+SIMPLE_OPTION(move_conflicting_paths,
+              "move-conflicting-paths/no-move-conflicting-paths",
+              bool,
               gettext_noop("move conflicting, unversioned paths into _MTN/resolutions "
                            "before proceeding with any workspace change"))