|
@@ -32,7 +32,8 @@ my $diff_ignore_default_regexp = '
|
|
|
# File-names that should be ignored (never directories)
|
|
|
(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
|
|
|
# File or directory names that should be ignored
|
|
|
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
|
|
|
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
|
|
|
+\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
|
|
|
';
|
|
|
|
|
|
# Take out comments and newlines
|