| changeset 26614 | ef1eb6df7071 |
| parent 26587 | 56b2bcea2529 |
| child 28070 | a504794cee29 |
| 26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
|---|---|
412 |
412 |
413 if not opts.get('print'): |
413 if not opts.get('print'): |
414 out.close() |
414 out.close() |
415 |
415 |
416 if m3.conflicts and not mode == 'union': |
416 if m3.conflicts and not mode == 'union': |
417 if not opts.get('quiet'): |
|
418 ui.warn(_("warning: conflicts during merge.\n")) |
|
419 return 1 |
417 return 1 |