How the hell did that get there..?
print $$string . $/;
my ($h, $p, $pi, $t, $ti) =
print $$string . $/;
my ($h, $p, $pi, $t, $ti) =
-<<<<<<< collectd-4.3:contrib/cussh.pl
- $$string =~ m/^(\w+)\/(\w+)(?:-(\w+))?\/(\w+)(?:-(\w+))?\s+/;
-=======
$$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
$$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
->>>>>>> local:contrib/cussh.pl
$$string = $';
return if ((! $h) || (! $p) || (! $t));
$$string = $';
return if ((! $h) || (! $p) || (! $t));