equal
deleted
inserted
replaced
683 back = None |
683 back = None |
684 files = (a, b, c, back) |
684 files = (a, b, c, back) |
685 |
685 |
686 r = 1 |
686 r = 1 |
687 try: |
687 try: |
688 markerstyle = ui.config('ui', 'mergemarkers', 'basic') |
688 markerstyle = ui.config('ui', 'mergemarkers') |
689 if not labels: |
689 if not labels: |
690 labels = _defaultconflictlabels |
690 labels = _defaultconflictlabels |
691 if markerstyle != 'basic': |
691 if markerstyle != 'basic': |
692 labels = _formatlabels(repo, fcd, fco, fca, labels) |
692 labels = _formatlabels(repo, fcd, fco, fca, labels) |
693 |
693 |