From 9af6413b96c85c9fcd9c34c015cd8fae0219ee04 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Fri, 19 Nov 2010 10:00:49 +0000
Subject: git-gui: support underline style when parsing diff output

Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 lib/diff.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/diff.tcl')

diff --git a/lib/diff.tcl b/lib/diff.tcl
index cf8a95ec34..39e4d909b8 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -504,7 +504,7 @@ proc read_diff {fd conflict_size cont_info} {
 			set prefix clr
 			foreach style [split $colbegin ";"] {
 				if {$style eq "7"} {append prefix i; continue}
-				if {$style < 30 || $style > 47} {continue}
+				if {$style != 4 && ($style < 30 || $style > 47)} {continue}
 				set a "$mark linestart + $posbegin chars"
 				set b "$mark linestart + $posend chars"
 				catch {$ui_diff tag add $prefix$style $a $b}
-- 
cgit v1.2.3