From: Charles Bailey Date: Mon, 13 Mar 2000 03:54:09 +0000 (+0000) Subject: Trim out leftover hunk from prior resolve conflict X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8808d359e4d319aa4495633aed4791890828a032;p=p5sagit%2Fp5-mst-13.2.git Trim out leftover hunk from prior resolve conflict p4raw-id: //depot/vmsperl@5695 --- diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm index cf048c5..28c1050 100644 --- a/lib/File/Spec/VMS.pm +++ b/lib/File/Spec/VMS.pm @@ -142,13 +142,6 @@ sub canonpath { else { return vmsify($path); } } else { ->>>> ORIGINAL VMS.pm#13 - $path =~ s-\]\[--g; $path =~ s/> foo.bar - $path =~ s/([\[<])000000\./$1/; # [000000.foo ==> foo - if ($reduce_ricochet) { - $path =~ s/\.[^\[<\.]+\.-([\]\>])/$1/g; - $path =~ s/([\[<\.])([^\[<\.]+)\.-\.?/$1/g; - } $path =~ s-\]\[--g; $path =~ s/> foo.bar $path =~ s/([\[<])000000\./$1/; # [000000.foo ==> foo 1 while $path =~ s{-\.-}{--}; # -.- ==> --