git-gui: there is no "mode *" diff header line
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Bert Wesarg committed
Dec 9, 2010 at 21:47 UTC
3c9ae64c81bf6261fa9b19de5b6134e321905838
1 file changed
+1
-2
lib/diff.tcl
+1
-2
@@ -417,8 +417,7 @@ proc read_diff {fd conflict_size cont_info} {
417
#
418
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
419
420
- if {[string match {mode *} $line]
421
- || [string match {new file *} $line]
420
+ if {[string match {new file *} $line]
421
|| [regexp {^(old|new) mode *} $line]
422
|| [string match {deleted file *} $line]
423
|| [string match {deleted symlink} $line]