Merge branch '2149_patchfs_single_line'

* 2149_patchfs_single_line:
  Ticket #2149: patches adding a single line are not shown correctly by patchfs.
This commit is contained in:
Andrew Borodin 2010-04-25 10:08:31 +04:00
commit 78ed49a78f

View File

@ -26,7 +26,7 @@ my $parsedates = eval 'require Date::Parse';
my $unified_header=qr/^--- .*\n\+\+\+ .*\n$/;
my $unified_extract=qr/^--- ([^\s]+).*\n\+\+\+ ([^\s]+)\s*([^\t\n]*)/;
my $unified_contents=qr/^([+\-\\ \n]|@@ .* @@)/;
my $unified_hunk=qr/@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+)) @@.*\n/;
my $unified_hunk=qr/@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@.*\n/;
my $context_header=qr/^\*\*\* .*\n--- .*\n$/;
my $context_extract=qr/^\*\*\* ([^\s]+).*\n--- ([^\s]+)\s*([^\t\n]*)/;