diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-09 21:47:53 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-28 09:01:17 +0000 |
| commit | ebd143ff999f40996832e9c221c41cb609578cd1 (patch) | |
| tree | 11e9b4adfdbb27408b67806ccca40fefc5b9351a | |
| parent | c976bbff3c3e46e700adbdc14def8c9432fc925c (diff) | |
| download | git-ebd143ff999f40996832e9c221c41cb609578cd1.tar.gz git-ebd143ff999f40996832e9c221c41cb609578cd1.tar.xz | |
git-gui: handle index lines only in the diff header
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rw-r--r-- | lib/diff.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index dae6ca683..0b72924f7 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -402,12 +402,12 @@ proc read_diff {fd conflict_size cont_info} { || [string match {diff --cc *} $line] || [string match {diff --combined *} $line] || [string match {--- *} $line] - || [string match {+++ *} $line]} { + || [string match {+++ *} $line] + || [string match {index *} $line]} { continue } } - if {[string match {index *} $line]} continue if {$line eq {deleted file mode 120000}} { set line "deleted symlink" } |