summaryrefslogtreecommitdiff
path: root/scripts/dpkg-mergechangelogs.pl
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
-rwxr-xr-xscripts/dpkg-mergechangelogs.pl10
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 7fd11fc96..20b33dc75 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -43,12 +43,10 @@ BEGIN {
use Algorithm::Merge qw(merge);
};
if ($@) {
- eval q{
- sub merge {
- my ($o, $a, $b) = @_;
- return @$a if join("\n", @$a) eq join("\n", @$b);
- return get_conflict_block($a, $b);
- }
+ *merge = sub {
+ my ($o, $a, $b) = @_;
+ return @$a if join("\n", @$a) eq join("\n", @$b);
+ return get_conflict_block($a, $b);
};
}
}