# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1259798775 -3600
# Node ID e97dd3a8e8d70450dce7b0a0dc8d420ea1d0bbc3
# Parent  a7d11deb47dd1873a4be0554415e9c0923255046# Parent  60cefb8b3c85b173b62ad37734bf8e3f680f6710
Merge with stable

diff -r a7d11deb47dd -r e97dd3a8e8d7 contrib/hgk
--- 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} {