equal
deleted
inserted
replaced
829 cd = fcd.changectx() |
829 cd = fcd.changectx() |
830 co = fco.changectx() |
830 co = fco.changectx() |
831 ca = fca.changectx() |
831 ca = fca.changectx() |
832 |
832 |
833 ui = repo.ui |
833 ui = repo.ui |
834 template = ui.config(b'ui', b'mergemarkertemplate') |
834 template = ui.config(b'command-templates', b'mergemarker') |
835 if tool is not None: |
835 if tool is not None: |
836 template = _toolstr(ui, tool, b'mergemarkertemplate', template) |
836 template = _toolstr(ui, tool, b'mergemarkertemplate', template) |
837 template = templater.unquotestring(template) |
837 template = templater.unquotestring(template) |
838 tres = formatter.templateresources(ui, repo) |
838 tres = formatter.templateresources(ui, repo) |
839 tmpl = formatter.maketemplater( |
839 tmpl = formatter.maketemplater( |
1098 # in conflict markers if premerge is 'keep' or 'keep-merge3'. |
1098 # in conflict markers if premerge is 'keep' or 'keep-merge3'. |
1099 premergelabels = labels |
1099 premergelabels = labels |
1100 labeltool = None |
1100 labeltool = None |
1101 if markerstyle != b'basic': |
1101 if markerstyle != b'basic': |
1102 # respect 'tool's mergemarkertemplate (which defaults to |
1102 # respect 'tool's mergemarkertemplate (which defaults to |
1103 # ui.mergemarkertemplate) |
1103 # command-templates.mergemarker) |
1104 labeltool = tool |
1104 labeltool = tool |
1105 if internalmarkerstyle != b'basic' or markerstyle != b'basic': |
1105 if internalmarkerstyle != b'basic' or markerstyle != b'basic': |
1106 premergelabels = _formatlabels( |
1106 premergelabels = _formatlabels( |
1107 repo, fcd, fco, fca, premergelabels, tool=labeltool |
1107 repo, fcd, fco, fca, premergelabels, tool=labeltool |
1108 ) |
1108 ) |