# 
# 
# patch "ChangeLog"
#  from [8e9bd73b17a124e9ca73a3ec8c65f75cd15e5d4e]
#    to [951b0bddebb411e8b4bcbec34d86eef3e6e756d1]
# 
# patch "diff_patch.hh"
#  from [5c0943c0c2620c840461f1f0850a7a80f5da8c10]
#    to [094dfdf8f752939ee4dac54366939df07e20898a]
# 
============================================================
--- ChangeLog	8e9bd73b17a124e9ca73a3ec8c65f75cd15e5d4e
+++ ChangeLog	951b0bddebb411e8b4bcbec34d86eef3e6e756d1
@@ -1,5 +1,10 @@
 2006-01-10  Nathaniel Smith  <address@hidden>
 
+	* diff_patch.hh (struct content_merger): Oops, forgot to remove
+	the merge2 prototype.
+
+2006-01-10  Nathaniel Smith  <address@hidden>
+
 	* std_hooks.lua: 
 	* lua.cc (hook_merge2): 
 	* diff_patch.cc (try_to_merge_files): Remove merge2 code, since we
============================================================
--- diff_patch.hh	5c0943c0c2620c840461f1f0850a7a80f5da8c10
+++ diff_patch.hh	094dfdf8f752939ee4dac54366939df07e20898a
@@ -133,14 +133,6 @@
                           file_id const & right,
                           file_id & merged_id);
 
-  // merge2 on a file (line by line)
-  bool try_to_merge_files(file_path const & left_path,
-                          file_path const & right_path,
-                          file_path const & merged_path,
-                          file_id const & left_id,
-                          file_id const & right_id,
-                          file_id & merged);
-
   std::string get_file_encoding(file_path const & path,
                                 roster_t const & ros);