diff options
| author | Lukas Mai <l.mai@web.de> | 2016-05-21 19:12:21 +0200 |
|---|---|---|
| committer | Lukas Mai <l.mai@web.de> | 2016-05-22 00:52:33 +0200 |
| commit | 397c43d88a02adee0747f7e7e7db500858dac48b (patch) | |
| tree | 70101ba9a63bdb7ed009cdf0d7f0f26b54b09413 /pod/perldiag.pod | |
| parent | 497064412d19d508aa2afbe2e8ab11407edc65e8 (diff) | |
| download | perl-397c43d88a02adee0747f7e7e7db500858dac48b.tar.gz | |
recognize and reject version control conflict markers (RT #127993)
Diffstat (limited to 'pod/perldiag.pod')
| -rw-r--r-- | pod/perldiag.pod | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pod/perldiag.pod b/pod/perldiag.pod index 2210a60c17..d6c27f920c 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -7058,6 +7058,12 @@ S<<-- HERE> in m/%s/ (F) You used a verb pattern that is not allowed an argument. Remove the argument or check that you are using the right verb. +=item Version control conflict marker '%s' + +(F) The parser found a line starting with C<E<lt><<<<<<>, +C<E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>E<gt>>, or C<=======>. These may be left by a +version control system to mark conflicts after a failed merge operation. + =item Version number must be a constant number (P) The attempt to translate a C<use Module n.n LIST> statement into |