Mercurial > hg-stable
changeset 9992:e97dd3a8e8d7
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Thu, 03 Dec 2009 01:06:15 +0100 |
| parents | a7d11deb47dd (current diff) 60cefb8b3c85 (diff) |
| children | 931d2c757627 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/hgk Thu Dec 03 01:01:49 2009 +0100 +++ b/contrib/hgk Thu Dec 03 01:06:15 2009 +0100 @@ -3154,8 +3154,8 @@ set pad [string range "----------------------------------------" 1 $l] $ctext insert end "$pad $header $pad\n" filesep set diffinhdr 1 - } elseif {[regexp {^(---|\+\+\+)} $line]} { - set diffinhdr 0 + } elseif {[regexp {^(---|\+\+\+) } $line] && $diffinhdr} { + set diffinhdr 1 } elseif {[regexp {^@@ -([0-9]+),([0-9]+) \+([0-9]+),([0-9]+) @@(.*)} \ $line match f1l f1c f2l f2c rest]} { if {$gaudydiff} {