/* SYNTAX TEST "Packages/HTML/HTML.sublime-syntax" */ Merge Conflict Marker Tests =========================== Conflict in Comments -------------------- Conflict in Plain Text ---------------------- <<<<<<< HEAD /* <- meta.block.conflict.begin.diff punctuation.section.block.begin.diff */ /*^^^^^ meta.block.conflict.begin.diff punctuation.section.block.begin.diff */ /* ^ meta.block.conflict.begin.diff - entity - punctuation */ /* ^^^^ meta.block.conflict.begin.diff entity.name.section.diff */ /* ^ meta.block.conflict.begin.diff - entity - punctuation */ ======= /* <- meta.block.conflict.separator.diff punctuation.section.block.diff */ /*^^^^^ meta.block.conflict.separator.diff punctuation.section.block.diff */ /* ^ meta.block.conflict.separator.diff - punctuation */ >>>>>>> master /* <- meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ Conflict in Doctype Tag Attributes ---------------------------------- >>>>>> master /* <- meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ > /* <- meta.tag.sgml.doctype.html punctuation.definition.tag.end.html */ >>>>>> master /* <- meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ ]> /* <- meta.tag.sgml.doctype.html meta.brackets.html meta.internal-subset.xml.html punctuation.section.brackets.end.html */ /* <- meta.tag.sgml.doctype.html punctuation.definition.tag.end.html */ Conflict in CDATA Tags ---------------------- >>>>>> master /*^^^^^^^^^^^^ meta.tag.sgml.cdata.html meta.string.html string.unquoted.cdata.html */ /* <- meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.block.conflict.end.diff - entity - punctuation */ ]]> Conflict in Block Tag Attributes --------------------------------
>>>>>> master /* <- meta.tag.block.any.html meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.tag.block.any.html meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.tag.block.any.html meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.tag.block.any.html meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.tag.block.any.html meta.block.conflict.end.diff - entity - punctuation */ > /* <- meta.tag.block.any.html punctuation.definition.tag.end.html */ Conflict in Inline Tag Attributes --------------------------------- >>>>>> master /* <- meta.tag.inline.any.html meta.block.conflict.end.diff punctuation.section.block.end.diff */ /*^^^^^ meta.tag.inline.any.html meta.block.conflict.end.diff punctuation.section.block.end.diff */ /* ^ meta.tag.inline.any.html meta.block.conflict.end.diff - entity - punctuation */ /* ^^^^^^ meta.tag.inline.any.html meta.block.conflict.end.diff entity.name.section.diff */ /* ^ meta.tag.inline.any.html meta.block.conflict.end.diff - entity - punctuation */ /> /* <- meta.tag.inline.any.html punctuation.definition.tag.end.html */ Conflict in Script Tag Attributes --------------------------------- Conflict in Style Tag Attributes --------------------------------- Conflict in Tag Attribute Values --------------------------------
/* <- meta.tag.block.any.html punctuation.definition.tag.end.html */