summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d19f8e)
raw | patch | inline | side by side (parent: 2d19f8e)
author | Michele Ballabio <barra_cuda@katamail.com> | |
Sun, 9 Sep 2007 19:09:07 +0000 (21:09 +0200) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Sun, 9 Sep 2007 23:47:26 +0000 (19:47 -0400) |
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
lib/diff.tcl | patch | blob | history |
diff --git a/lib/diff.tcl b/lib/diff.tcl
index 9eeff2ed3590da610ce5eb2243f6d9d4474366c3..a1d5e523d2efd900c96c7905f8b0d6b76f4b2f32 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
if {[string match {mode *} $line]
|| [string match {new file *} $line]
|| [string match {deleted file *} $line]
+ || [string match {deleted symlink} $line]
|| [string match {Binary files * and * differ} $line]
|| $line eq {\ No newline at end of file}
|| [regexp {^\* Unmerged path } $line]} {