Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 2890ff8c73d68e1609cb18f1f313d66336bdfbde..e7fed9ad8ce9c838da52039e6a117b5b4f6c2c73 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use IkiWiki;
 
-package IkiWiki;
-
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
@@ -171,7 +171,7 @@ sub rcs_diff ($) { #{{{
        }
 
        my $revminusone = $changesets[$i+1];
-       return scalar `tla diff -d $config{srcdir} $revminusone`;
+       return `tla diff -d $config{srcdir} $revminusone`;
 } #}}}
 
 sub rcs_getctime ($) { #{{{