#
#
# patch "cmd_merging.cc"
#  from [539dfe1f78caee01532575473b22535122f4c148]
#    to [3bc3b7bd025f88bd49e24cf291782501302ff313]
# 
# patch "merge_conflict.cc"
#  from [77fd9f5f1549ea8244367929b275509f50dd875e]
#    to [ca85abf0a191c8fac5b72f991a31bd79fde10759]
# 
# patch "options_list.hh"
#  from [2766f71455bd95bf39d04ac3bf2e6423e4717cf3]
#    to [68ddfde3afe6fda9ac35b42db29ba648d4147826]
#
============================================================
--- cmd_merging.cc	539dfe1f78caee01532575473b22535122f4c148
+++ cmd_merging.cc	3bc3b7bd025f88bd49e24cf291782501302ff313
@@ -547,7 +547,7 @@ CMD(merge, "merge", "", CMD_REF(tree), "
 
   size_t pass = 1, todo = heads.size() - 1;
 
-  if (app.opts.resolve_conflicts_given || app.opts.resolve_conflicts_file_given)
+  if (app.opts.resolve_conflicts)
     {
       // conflicts and resolutions only apply to first merge, so only do that one.
       todo = 1;
============================================================
--- merge_conflict.cc	77fd9f5f1549ea8244367929b275509f50dd875e
+++ merge_conflict.cc	ca85abf0a191c8fac5b72f991a31bd79fde10759
@@ -2230,7 +2230,7 @@ parse_resolve_conflicts_opts (options co
                               roster_merge_result & result,
                               bool & resolutions_given)
 {
-if (opts.resolve_conflicts_given || opts.resolve_conflicts_file_given)
+  if (opts.resolve_conflicts)
     {
       resolutions_given = true;
 
============================================================
--- options_list.hh	2766f71455bd95bf39d04ac3bf2e6423e4717cf3
+++ options_list.hh	68ddfde3afe6fda9ac35b42db29ba648d4147826
@@ -750,8 +750,8 @@ OPTSET(resolve_conflicts_opts)
 #endif
 
 OPTSET(resolve_conflicts_opts)
-OPTVAR(resolve_conflicts_opts, bookkeeping_path, resolve_conflicts_file, )
-OPTVAR(resolve_conflicts_opts, bool, resolve_conflicts, )
+OPTVAR(resolve_conflicts_opts, bookkeeping_path,
+       resolve_conflicts_file, "_MTN/conflicts")
 
 OPTION(resolve_conflicts_opts, resolve_conflicts_file, true, "resolve-conflicts-file",
        gettext_noop("use file to resolve conflicts"))
@@ -763,18 +763,13 @@ OPTION(resolve_conflicts_opts, resolve_c
     origin::user,
     F("conflicts file must be under _MTN"));
   resolve_conflicts_file = bookkeeping_path(arg, origin::user);
+  resolve_conflicts = true;
 }
 #endif
 
-OPTION(resolve_conflicts_opts, resolve_conflicts, false, "resolve-conflicts",
-       gettext_noop("use _MTN/conflicts to resolve conflicts"))
-#ifdef option_bodies
-{
-  E(!resolve_conflicts_file_given, origin::user,
-    F("only one of --resolve-conflicts or --resolve-conflicts-file may be given"));
-  resolve_conflicts_file = bookkeeping_path("_MTN/conflicts");
-}
-#endif
+OPTSET_REL(resolve_conflicts_opts, resolve_conflicts)
+SIMPLE_OPTION(resolve_conflicts, "resolve-conflicts/no-resolve-conflicts", bool,
+       gettext_noop("specify conflict resolutions in a file, instead of interactively"))
 
 OPTSET(conflicts_opts)
 OPTVAR(conflicts_opts, bookkeeping_path, conflicts_file, bookkeeping_path("_MTN/conflicts"))