#
#
# patch "cmd_automate.cc"
#  from [12ac852434d7da216115bcddac1c47986449fcc1]
#    to [c027b275e7ac563ad234f48e9af50d14abeb1a82]
# 
# patch "cmd_conflicts.cc"
#  from [419fe5e356704374a400c7e679eac0a1d2658ce9]
#    to [8cba28b58e4809f0315fade0a06cb9fa5da11ebd]
# 
# patch "monotone.texi"
#  from [922b39c25148535ddce1387c5708ad48bf386937]
#    to [a430ff48f72f79fda5eb5aa03737850a1403f8ca]
#
============================================================
--- cmd_automate.cc	12ac852434d7da216115bcddac1c47986449fcc1
+++ cmd_automate.cc	c027b275e7ac563ad234f48e9af50d14abeb1a82
@@ -68,7 +68,7 @@ namespace commands {
   }
 }
 
-static string const interface_version = "8.1";
+static string const interface_version = "8.2";
 // Major or minor number only increments once for each monotone release;
 // check the most recent release before incrementing this.
 
============================================================
--- cmd_conflicts.cc	419fe5e356704374a400c7e679eac0a1d2658ce9
+++ cmd_conflicts.cc	8cba28b58e4809f0315fade0a06cb9fa5da11ebd
@@ -189,7 +189,7 @@ do_interactive_merge(database & db,
   conflicts.ancestor_roster->get_name(nid, ancestor_path);
   conflicts.left_roster->get_name(nid, left_path);
   conflicts.right_roster->get_name(nid, right_path);
-  
+
   file_data left_data, right_data, ancestor_data;
   data merged_unpacked;
 
@@ -288,7 +288,7 @@ set_first_conflict(database & db,
                   N(bookkeeping_path::external_string_is_bookkeeping_path(utf8(idx(args,1)())),
                     F("result path must be under _MTN"));
                   bookkeeping_path const result_path(idx(args,1)());
-                  
+
                   N(args.size() == 2, F("wrong number of arguments"));
 
                   if (do_interactive_merge(db, lua, conflicts, conflict.nid,
============================================================
--- monotone.texi	922b39c25148535ddce1387c5708ad48bf386937
+++ monotone.texi	a430ff48f72f79fda5eb5aa03737850a1403f8ca
@@ -8797,7 +8797,7 @@ @section Automation
 
 @itemize
 @item
-8.1: -- Added default resolution for file content conflicts, user
+8.2: -- Added default resolution for file content conflicts, user
 resolutions for others. @code{directory_loop_created} changed to @code{directory_loop}.
 @item
 7.1 -- initial