This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
recognize and reject version control conflict markers (RT #127993)
authorLukas Mai <l.mai@web.de>
Sat, 21 May 2016 17:12:21 +0000 (19:12 +0200)
committerLukas Mai <l.mai@web.de>
Sat, 21 May 2016 22:52:33 +0000 (00:52 +0200)
commit397c43d88a02adee0747f7e7e7db500858dac48b
tree70101ba9a63bdb7ed009cdf0d7f0f26b54b09413
parent497064412d19d508aa2afbe2e8ab11407edc65e8
recognize and reject version control conflict markers (RT #127993)
pod/perldelta.pod
pod/perldiag.pod
t/comp/parser.t
toke.c