This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
(perl #127993) test reporting of multiple conflict markers
authorTony Cook <tony@develop-help.com>
Mon, 6 Jun 2016 00:43:48 +0000 (10:43 +1000)
committerTony Cook <tony@develop-help.com>
Mon, 6 Jun 2016 00:43:48 +0000 (10:43 +1000)
t/lib/croak/toke

index 9f90500..1c6e4a2 100644 (file)
@@ -297,3 +297,15 @@ Execution of - aborted due to compilation errors.
 BEGIN <>
 EXPECT
 Illegal declaration of subroutine BEGIN at - line 1.
+########
+# NAME multiple conflict markers
+<<<<<<< yours:sample.txt
+my $some_code;
+=======
+my $some_other_code;
+>>>>>>> theirs:sample.txt
+EXPECT
+Version control conflict marker at - line 1, near "<<<<<<<"
+Version control conflict marker at - line 3, near "======="
+Version control conflict marker at - line 5, near ">>>>>>>"
+Execution of - aborted due to compilation errors.