Merge in GIT 1.5.3.8

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 43565e412fa6c3c96487051c3997424e7d144b22..18aba3eae34297471aa905c9e157e1b5aedd369e 100644 (file)
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -220,6 +220,7 @@ proc read_diff {fd} {
 
                if {[string match {mode *} $line]
                        || [string match {new file *} $line]
+                       || [regexp {^(old|new) mode *} $line]
                        || [string match {deleted file *} $line]
                        || [string match {deleted symlink} $line]
                        || [string match {Binary files * and * differ} $line]