-
-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squiz/Heredoc: move a test to its own file
Move the git conflict/parse error test to its own file. Related to 143
- Loading branch information
Showing
2 changed files
with
17 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
|
||
// Intentional parse error. | ||
// The following function has a simulated git conflict for testing. | ||
// This is not a merge conflict - it is a valid test case. | ||
// Please do not remove. | ||
function test() | ||
{ | ||
$arr = array( | ||
'a' => 'a' | ||
<<<<<<< HEAD | ||
'b' => 'b' | ||
======= | ||
'c' => 'c' | ||
>>>>>>> master | ||
); | ||
} |