projects
/
p5sagit/p5-mst-13.2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1bef09
216e7de
)
Merge branch 'blead' into smartmatch
Rafael Garcia-Suarez [Tue, 5 May 2009 10:09:48 +0000 (12:09 +0200)]
Conflicts:
t/op/switch.t
1
2
op.c
patch
|
diff1
|
diff2
|
blob
|
history
pod/perlsyn.pod
patch
|
diff1
|
diff2
|
blob
|
history
pp_ctl.c
patch
|
diff1
|
diff2
|
blob
|
history
t/op/switch.t
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
op.c
Simple merge
diff --cc
pod/perlsyn.pod
Simple merge
diff --cc
pp_ctl.c
Simple merge
diff --cc
t/op/switch.t
index
de44082
,
a4977c7
..
f4cedba
---
1
/
t/op/switch.t
---
2
/
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