Changeset View
Changeset View
Standalone View
Standalone View
src/lint/linter/ArcanistMergeConflictLinter.php
| Context not available. | |||||
| foreach ($lines as $lineno => $line) { | foreach ($lines as $lineno => $line) { | ||||
| // An unresolved merge conflict will contain a series of seven | // An unresolved merge conflict will contain a series of seven | ||||
| // '<', '=', or '>'. | // '<', '=', or '>'. | ||||
| if (preg_match('/^(>{7}|<{7}|={7})$/', $line)) { | if (@preg_match('/^(>{7}|<{7}|={7})$/', $line)) { | ||||
| $this->raiseLintAtLine( | $this->raiseLintAtLine( | ||||
| $lineno + 1, | $lineno + 1, | ||||
| 1, | 1, | ||||
| Context not available. | |||||
Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0