From: Rafael Garcia-Suarez Date: Tue, 5 May 2009 10:09:48 +0000 (+0200) Subject: Merge branch 'blead' into smartmatch X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9de654f174a7c7ca88031e2ac4a33add560d0c8c;p=p5sagit%2Fp5-mst-13.2.git Merge branch 'blead' into smartmatch Conflicts: t/op/switch.t --- 9de654f174a7c7ca88031e2ac4a33add560d0c8c diff --cc t/op/switch.t index de44082,a4977c7..f4cedba --- a/t/op/switch.t +++ b/t/op/switch.t @@@ -8,7 -8,7 +8,7 @@@ BEGIN use strict; use warnings; - use Test::More tests => 113; -use Test::More tests => 122; ++use Test::More tests => 124; # The behaviour of the feature pragma should be tested by lib/switch.t # using the tests in t/lib/switch/*. This file tests the behaviour of