#
#
# patch "options_list.hh"
#  from [521e90001833b8023276b7cedd0ed4b3253c1fd4]
#    to [4f0483db8e18e652824cd16c29d34ff3c8f31c79]
#
============================================================
--- options_list.hh	521e90001833b8023276b7cedd0ed4b3253c1fd4
+++ options_list.hh	4f0483db8e18e652824cd16c29d34ff3c8f31c79
@@ -1,5 +1,5 @@
 // Copyright (C) 2006 Timothy Brownawell <address@hidden>
-//               2008-2009 Stephen Leake <address@hidden>
+//               2008-2010 Stephen Leake <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
 // greater. See the accompanying file COPYING for details.
@@ -390,7 +390,7 @@ OPT(move_conflicting_paths, "move-confli
 #endif
 
 OPT(move_conflicting_paths, "move-conflicting-paths", bool, false,
-        gettext_noop("move conflicting, unversioned paths into _MTN/conflicts "
+        gettext_noop("move conflicting, unversioned paths into _MTN/resolutions "
                      "before proceeding with any workspace change"))
 #ifdef option_bodies
 {