mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-08 20:41:59 +03:00
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:
commit
78ed49a78f
@ -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]*)/;
|
||||
|
Loading…
Reference in New Issue
Block a user