#
#
# patch "cmd_diff_log.cc"
#  from [197c4f6f8a28fb1d57026c715693a936ccba2c98]
#    to [82af527afc535dbae3f3fc2bb18f994a072448f1]
# 
# patch "unix/process.cc"
#  from [c2cd8287974a405ba13a1cc9038c12545e21a38d]
#    to [5d7d05a81a24a4556143f1570ffda45441140fa5]
# 
# patch "win32/process.cc"
#  from [35decb7bfc80bcd54893ce784c325c71c1415e3d]
#    to [cd9dc0730fa7e5f12f96355371b2f266267efebf]
#
============================================================
--- cmd_diff_log.cc	197c4f6f8a28fb1d57026c715693a936ccba2c98
+++ cmd_diff_log.cc	82af527afc535dbae3f3fc2bb18f994a072448f1
@@ -509,10 +509,14 @@ CMD(diff, "diff", "", CMD_REF(informativ
     }
   cout << "#\n";
 
-  if (app.opts.diff_format == external_diff) {
-    do_external_diff(included, app, new_is_archived);
-  } else
-    dump_diffs(included, app, new_is_archived, cout);
+  if (app.opts.diff_format == external_diff)
+    {
+      do_external_diff(included, app, new_is_archived);
+    }
+  else
+    {
+      dump_diffs(included, app, new_is_archived, cout);
+    }
 }
 
 
============================================================
--- unix/process.cc	c2cd8287974a405ba13a1cc9038c12545e21a38d
+++ unix/process.cc	5d7d05a81a24a4556143f1570ffda45441140fa5
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <iostream>
 #include <sstream>
 
 #include "sanity.hh"
@@ -90,9 +91,9 @@ pid_t process_spawn(const char * const a
         cmdline_ss << "'" << *i << "'";
       }
     L(FL("spawning command: %s\n") % cmdline_ss.str());
-  }       
-  pid_t pid;
-  pid = fork();
+  }
+  std::cout.flush();
+  pid_t pid = fork();
   switch (pid)
     {
     case -1: /* Error */
============================================================
--- win32/process.cc	35decb7bfc80bcd54893ce784c325c71c1415e3d
+++ win32/process.cc	cd9dc0730fa7e5f12f96355371b2f266267efebf
@@ -1,8 +1,9 @@
 // copyright (C) 2005 Jon Bright <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
 // see the file COPYING for details
 
+#include <iostream>
 #include <string>
 #include <sstream>
 #include <windows.h>
@@ -135,6 +136,7 @@ pid_t process_spawn(const char * const a
   memset(&si, 0, sizeof(si));
   si.cb = sizeof(STARTUPINFO);
   /* We don't need to set any of the STARTUPINFO members */
+  std::cout.flush();
   if (CreateProcess(realexe, (char*)cmd.c_str(), NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)==0)
     {
       os_err_t errnum = GetLastError();