#
#
# patch "diff_output.cc"
#  from [689185f3dfca8b8a505f386474c107493190e9e6]
#    to [42381dd83f123ec8ed07a4894f3e802de846a2e0]
#
============================================================
--- diff_output.cc	689185f3dfca8b8a505f386474c107493190e9e6
+++ diff_output.cc	42381dd83f123ec8ed07a4894f3e802de846a2e0
@@ -17,6 +17,7 @@
 #include "simplestring_xform.hh"
 
 #include <ostream>
+#include <sstream>
 #include <iterator>
 #include <boost/scoped_ptr.hpp>
 
@@ -25,6 +26,7 @@ using std::string;
 using std::ostream;
 using std::ostream_iterator;
 using std::string;
+using std::stringstream;
 using std::vector;
 using boost::scoped_ptr;
 
@@ -208,22 +210,23 @@ void unidiff_hunk_writer::flush_hunk(siz
         }
 
       // write hunk to stream
+      stringstream ss;
       if (a_len == 0)
-        ost << "@@ -0,0";
+        ss << "@@ -0,0";
       else
         {
-          ost << "@@ -" << a_begin+1;
+          ss << "@@ -" << a_begin+1;
           if (a_len > 1)
-            ost << ',' << a_len;
+            ss << ',' << a_len;
         }
 
       if (b_len == 0)
-        ost << " +0,0";
+        ss << " +0,0";
       else
         {
-          ost << " +" << b_begin+1;
+          ss << " +" << b_begin+1;
           if (b_len > 1)
-            ost << ',' << b_len;
+            ss << ',' << b_len;
         }
 
       {
@@ -238,8 +241,11 @@ void unidiff_hunk_writer::flush_hunk(siz
             }
 
         find_encloser(a_begin + first_mod, encloser);
-        ost << " @@" << colorizer.colorize(encloser,
-                                           diff_colorizer::encloser) << '\n';
+        ss << " @@";
+
+        ost << colorizer.colorize(ss.str(), diff_colorizer::bold);
+        ost << colorizer.colorize(encloser, diff_colorizer::encloser);
+        ost << '\n';
       }
       copy(hunk.begin(), hunk.end(), ostream_iterator<string>(ost, "\n"));
     }
@@ -369,8 +375,8 @@ void cxtdiff_hunk_writer::flush_hunk(siz
         find_encloser(a_begin + min(first_insert, first_delete),
                       encloser);
 
-        ost << "***************" << colorizer.colorize(encloser,
-                                                       diff_colorizer::encloser) << '\n';
+        ost << colorizer.colorize("***************", diff_colorizer::bold)
+            << colorizer.colorize(encloser, diff_colorizer::encloser) << '\n';
       }
 
       ost << "*** " << (a_begin + 1) << ',' << (a_begin + a_len) << " ****\n";