443     for line in m3.merge_lines(name_a=name_a, name_b=name_b,

   443     for line in m3.merge_lines(name_a=name_a, name_b=name_b,

   444                                reprocess=reprocess):

   444                                reprocess=reprocess):

   445         out.write(line)

   445         out.write(line)

   446 

   446 

   447     if not opts.get('print'):

   447     if not opts.get('print'):

   449 

   449 

   450     if m3.conflicts:

   450     if m3.conflicts:

   451         if not opts.get('quiet'):

   451         if not opts.get('quiet'):

   452             ui.warn(_("warning: conflicts during merge.\n"))

   452             ui.warn(_("warning: conflicts during merge.\n"))

   453         return 1

   453         return 1