<<<<<<< HEAD

Testing a merge conflict.

=======

Another text string.

>>>>>>> ref/heads/feature-branch
<<<<<<< HEAD

=======

>>>>>>> ref/heads/feature-branch
>>>>>> master /* * The above tests are based on "normal" tokens. * The below test checks that once the tokenizer breaks down because of * unexpected merge conflict boundaries - i.e. after the first merge conflict * opener in non-comment, non-heredoc/nowdoc, non-inline HTML code -, subsequent * merge conflict boundaries will still be detected correctly. */ ?>
<<<<<<< HEAD

Testing a merge conflict.

=======

Another text string.

>>>>>>> ref/heads/feature-branch