git-gui: support underline style when parsing diff output

diff --git a/lib/diff.tcl b/lib/diff.tcl
index cf8a95ec346a9a8afa60a3812d59a8caa4bb4c3f..39e4d909b8c5f0f90f56c8e4a202976673026605 100644 (file)
--- 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}