Create New Item
Item Type
File
Folder
Item Name
Search file in folder and subfolders...
Are you sure want to rename?
primogenial
/
themes
/
storefront
/
vendor
/
squizlabs
/
php_codesniffer
/
src
/
Standards
/
Generic
/
Tests
/
VersionControl
:
GitMergeConflictUnitTest.2.inc
Advanced Search
Upload
New Item
Settings
Back
Back Up
Advanced Editor
Save
<?php /** <<<<<<< HEAD * @var string $bar ======= * @var string $bar >>>>>>> master */ /* * Testing detecting merge conflicts using different comment styles. * <<<<<<< HEAD * @var string $bar */ public function foo($bar){ } /* ======= * @var string $bar >>>>>>> master */ // Comment <<<<<<< HEAD // Second comment line. NOTE: The above opener breaks the tokenizer. ======= // New second comment line >>>>>>> master // Third comment line