# 
# patch "merge.cc"
#  from [f07e0c99b5b47098b03eb2d708a4ecfbddfc4ffb]
#    to [a4c1ca4f129940d245ad2f199bfb662cbfdfc0c5]
# 
========================================================================
--- merge.cc	f07e0c99b5b47098b03eb2d708a4ecfbddfc4ffb
+++ merge.cc	a4c1ca4f129940d245ad2f199bfb662cbfdfc0c5
@@ -51,7 +51,8 @@
   
   if (!result.is_clean())
     {
-      L(F("unclean mark-merge: %d name conflicts, %d content conflicts, %d attr conflicts, %d orphaned node conflicts, %d rename target conflicts, %d directory loop conflicts\n") 
+      L(F("unclean mark-merge: %d name conflicts, %d content conflicts, %d attr conflicts, "
+	  "%d orphaned node conflicts, %d rename target conflicts, %d directory loop conflicts\n") 
         % result.node_name_conflicts.size()
         % result.file_content_conflicts.size()
         % result.node_attr_conflicts.size()
@@ -146,6 +147,9 @@
           result.file_content_conflicts = residual_conflicts;     
         }
     }
+
+  E(result.is_clean(),
+    F("merge failed due to unresolved conflicts\n"));
 }
 
 void