[Monotone-commits-diffs] net.venge.monotone.issue-209.file_attribute: ce0796c45c33e74a06c1d82f2b12d9261419bee2

[code]

revision:            ce0796c45c33e74a06c1d82f2b12d9261419bee2
date:                2012-06-22T21:32:57
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.issue-209.file_attribute
changelog:
Correct "--resolve_conflict" to "--resolve-conflicts"

manifest:
format_version "1"

new_manifest [e93c6203796d69bbce2f5c36d537ecbd412d848a]

old_revision [fc8be5f8894e0e0160f475b0cf463180649926db]

patch "doc/monotone.texi"
 from [45b26a16e3411a896b0c99e84c3e21842cfa9368]
   to [9246f666cb62944797fd980b529eb95b548aa0dd]

patch "src/merge_conflict.cc"
 from [9e1f37fb81b2d1ba5f9553f5bf171e784e86ad5a]
   to [34fbc891bc8455202d9c0d0a495beb690fd8a5a0]

patch "src/merge_content.cc"
 from [f29f3cabcacd554b53f6f273c3df3ca3ceec7a49]
   to [662433acaf08fc1f3f3417389a9bc3b3d2bd9bf1]
============================================================
--- doc/monotone.texi	45b26a16e3411a896b0c99e84c3e21842cfa9368
+++ doc/monotone.texi	9246f666cb62944797fd980b529eb95b548aa0dd
@@ -3497,11 +3497,11 @@ @subheading Dropped/Modified file Confli
 
 In addition, the attribute @command{mtn:resolve_conflict} may be used
 to specify a @command{drop} resolution for this
-conflict. @command{--resolve_conflict} must be specified on the merge
+conflict. @command{--resolve-conflicts} must be specified on the merge
 command for the attribute to be processed. Note that a
 @file{_MTN/conflicts} file left over from a previous merge will be
-processed when @command{--resolve_conflict}; the user must delete such
-files when they are no longer needed.
+processed when @command{--resolve-conflicts} is specified; the user must
+delete such files when they are no longer needed.
 
 The attribute is useful in the case
 where the conflict will occur again in the future, for example when a
============================================================
--- src/merge_conflict.cc	9e1f37fb81b2d1ba5f9553f5bf171e784e86ad5a
+++ src/merge_conflict.cc	34fbc891bc8455202d9c0d0a495beb690fd8a5a0
@@ -2662,7 +2662,7 @@ parse_resolve_conflicts_opts (options co
 
       if (!file_exists(system_path(opts.resolve_conflicts_file)))
         {
-          // user may specify --resolve_conflicts to enable attr
+          // user may specify --resolve-conflicts to enable attr
           // mtn:resolve_conflict, without _MTN/conflicts.
           return;
         }
============================================================
--- src/merge_content.cc	f29f3cabcacd554b53f6f273c3df3ca3ceec7a49
+++ src/merge_content.cc	662433acaf08fc1f3f3417389a9bc3b3d2bd9bf1
@@ -724,7 +724,7 @@ resolve_merge_conflicts(lua_hooks & lua,
 
       if (resolutions_given)
         {
-          // We require --resolve_conflicts to enable processing attr
+          // We require --resolve-conflicts to enable processing attr
           // mtn:resolve_conflict.
 
           // If there are any conflicts for which we don't currently support