Code

git-gui: there is no "mode *" diff header line
authorBert Wesarg <bert.wesarg@googlemail.com>
Thu, 9 Dec 2010 20:47:55 +0000 (21:47 +0100)
committerPat 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>
lib/diff.tcl

index aa300891aa644419186d947c98cc6bc10841b8ac..20f50ddab2ca7b0fc8d3abec95b74591a1377ceb 100644 (file)
@@ -417,8 +417,7 @@ proc read_diff {fd conflict_size cont_info} {
                #
                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]