equal
deleted
inserted
replaced
374 else: |
374 else: |
375 ui.status(_("merging %s\n") % fd) |
375 ui.status(_("merging %s\n") % fd) |
376 |
376 |
377 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) |
377 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) |
378 |
378 |
379 markerstyle = ui.config('ui', 'mergemarkers', 'detailed') |
379 markerstyle = ui.config('ui', 'mergemarkers', 'basic') |
380 if markerstyle == 'basic': |
380 if markerstyle == 'basic': |
381 formattedlabels = _defaultconflictlabels |
381 formattedlabels = _defaultconflictlabels |
382 else: |
382 else: |
383 if not labels: |
383 if not labels: |
384 labels = _defaultconflictlabels |
384 labels = _defaultconflictlabels |