# 
# 
# patch "ChangeLog"
#  from [798f230ae312fce6ea1997352db1105f3ba78b7a]
#    to [0130ecbaa2989fceabd5ca3ee2f4f6a7678df707]
# 
# patch "cmd_diff_log.cc"
#  from [45a4d5bc987405fed7fdc05204b29bafc56e34bc]
#    to [fb75f33c9b28b0d4084395c05202f1f717336677]
# 
# patch "std_hooks.lua"
#  from [eb8ff0f111c7d7ac911e2f3840ede5575acb2cf7]
#    to [d58c9f82407bd774bca64fcdae804f8881c80ff1]
# 
============================================================
--- ChangeLog	798f230ae312fce6ea1997352db1105f3ba78b7a
+++ ChangeLog	0130ecbaa2989fceabd5ca3ee2f4f6a7678df707
@@ -1,5 +1,10 @@
 2006-06-03  Graydon Hoare  <address@hidden>
 
+	* std_hooks.lua (merge3_xxdiff_cmd): Fix typo.
+	* cmd_diff_log.cc (dump_diffs): Undo overzealous removal of '\n'.
+
+2006-06-03  Graydon Hoare  <address@hidden>
+
 	* {cert,charset,cleanup,cmd*}.{cc,hh}: Coppyright and formatting
 	fixes.
 
============================================================
--- cmd_diff_log.cc	45a4d5bc987405fed7fdc05204b29bafc56e34bc
+++ cmd_diff_log.cc	fb75f33c9b28b0d4084395c05202f1f717336677
@@ -257,9 +257,9 @@
           split_into_lines(unpacked(), lines);
           if (! lines.empty())
             {
-              cout << (FL("--- %s\t%s") % file_path(i->first) % i->second)
-                   << (FL("+++ %s\t%s") % file_path(i->first) % i->second)
-                   << (FL("@@ -0,0 +1,%d @@") % lines.size());
+              cout << (FL("--- %s\t%s\n") % file_path(i->first) % i->second)
+                   << (FL("+++ %s\t%s\n") % file_path(i->first) % i->second)
+                   << (FL("@@ -0,0 +1,%d @@\n") % lines.size());
               for (vector<string>::const_iterator j = lines.begin();
                    j != lines.end(); ++j)
                 {
============================================================
--- std_hooks.lua	eb8ff0f111c7d7ac911e2f3840ede5575acb2cf7
+++ std_hooks.lua	d58c9f82407bd774bca64fcdae804f8881c80ff1
@@ -363,7 +363,7 @@
    return 
    function()
       local path = "xxdiff"
-      local ret execute(path, 
+      local ret = execute(path, 
 			"--title1", left_path,
 			"--title2", right_path,
 			"--title3", merged_path,