Merge branch 'performance'

Conflicts:
	faster-dupemerge

diff --cc faster-dupemerge
index 0b43a3c7a2bd26ce6f36377311c66bdb885f70f2,6223ab0adc2d7cacb4dee7e7c4f4e71a2aa3a1d4..d35f591a442a9c7bb6c52ea160bed284825089b0
--- 1/faster-dupemerge
--- 2/faster-dupemerge
+++ b/faster-dupemerge
@@@ -343,9 -342,9 +343,9 @@@ hash_file
  link_start:
  
                                until ($finished) {
-                                       my @incumbent_names = keys(%{$inode_to_file_name{$incumbent}});
-                                       my @candidate_names = keys(%{$inode_to_file_name{$candidate}});
+                                       my @incumbent_names = sort keys(%{$inode_to_file_name{$incumbent}});
+                                       my @candidate_names = sort keys(%{$inode_to_file_name{$candidate}});
 -                                      print STDERR "\t\tLinks to $incumbent:",   join("\n\t\t\t", '', @incumbent_names),   "\n" if $debug;
 +                                      print STDERR "\t\tLinks to $incumbent:", join("\n\t\t\t", '', @incumbent_names), "\n" if $debug;
                                        print STDERR "\t\tLinks to $candidate:", join("\n\t\t\t", '', @candidate_names), "\n" if $debug;
  
  incumbent_file:
@@@ -537,7 -544,7 +543,7 @@@ end_merge
  }
  
  while (<FIND>) {
-       my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+) (.+)\0$/so;
 -      my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?\d+) (\d+:\d+) (.+)\0$/so;
++      my ($weak_key, $inode, $name) = m/^(\d+ \d+ \d+ \d+ -?[\d.]+) (\d+:\d+) (.+)\0$/so;
        die "read error: $!\nLast input line was '$_'" unless defined($name);
  
        print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;