diff options
author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-11-19 10:00:49 +0000 |
---|---|---|
committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-11-04 16:16:52 +0000 |
commit | 9af6413b96c85c9fcd9c34c015cd8fae0219ee04 (patch) | |
tree | 4d3f55616dc43d8271e16da3b16449864133239d /lib | |
parent | git-gui: fix spelling error in sshkey.tcl (diff) | |
download | tgif-9af6413b96c85c9fcd9c34c015cd8fae0219ee04.tar.xz |
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>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/diff.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
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} |