In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/7ea1e3fa66d11c345be6c5f6b09d0f98d51be541?hp=ae6a7057e4d2551a1462df59ec93f4a3629bb896>
- Log ----------------------------------------------------------------- commit 7ea1e3fa66d11c345be6c5f6b09d0f98d51be541 Author: H.Merijn Brand - Tux <[email protected]> Date: Sun Nov 13 15:42:52 2016 +0100 Exclude diffs the will never be resolved ----------------------------------------------------------------------- Summary of changes: ls-diff.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ls-diff.pl b/ls-diff.pl index 08f55b5..153848f 100755 --- a/ls-diff.pl +++ b/ls-diff.pl @@ -32,6 +32,7 @@ GetOptions ( my $pat = shift // "."; $pat = qr{$pat}; +my %exempt = map {( s/[\s\n].*\z//rs => 1 )} <DATA>; my %m; foreach my $u ( [ "g", "dist-git/mcon/U" ], @@ -44,6 +45,8 @@ foreach my $u ( [ "g", "dist-git/mcon/U" ], m/\.U$/ or return; m{$pat} or return; + $exempt{$_} and return; + my $u = do { local (@ARGV, $/) = $_; <> }; $m{$_}{$t} = { dir => $File::Find::dir, @@ -128,3 +131,6 @@ sub extdiff { } close $fh; } # extdiff + +__END__ +package.U Will never be equal due to conflicting needs -- perl5 metaconfig repository
