diff options
Diffstat (limited to 'lib/diff.tcl')
| -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 dae6ca6831..0b72924f7a 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" } |