summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 97b8ee1)
raw | patch | inline | side by side (parent: 97b8ee1)
author | Bert Wesarg <bert.wesarg@googlemail.com> | |
Thu, 9 Dec 2010 20:47:55 +0000 (21:47 +0100) | ||
committer | Pat Thoyts <patthoyts@users.sourceforge.net> | |
Fri, 28 Jan 2011 09:01:17 +0000 (09:01 +0000) |
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
lib/diff.tcl | patch | blob | history |
diff --git a/lib/diff.tcl b/lib/diff.tcl
index aa300891aa644419186d947c98cc6bc10841b8ac..20f50ddab2ca7b0fc8d3abec95b74591a1377ceb 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
- if {[string match {mode *} $line]
- || [string match {new file *} $line]
+ if {[string match {new file *} $line]
|| [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line]
|| [string match {deleted symlink} $line]