# 
# 
# patch "roster_merge.cc"
#  from [796c93fefca45d7d767d073a3a745ed111fe67d2]
#    to [d7c74a87bbe64ca0576fa6c546573e2b34c165c8]
# 
============================================================
--- roster_merge.cc	796c93fefca45d7d767d073a3a745ed111fe67d2
+++ roster_merge.cc	d7c74a87bbe64ca0576fa6c546573e2b34c165c8
@@ -105,6 +105,7 @@
   debug_describe_conflicts(result, out);
   std::string roster_part;
   dump(result.roster, roster_part);
+  out += "\n\n";
   out += roster_part;
 }