Browse Source

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>
maint
Bert Wesarg 14 years ago committed by Pat Thoyts
parent
commit
3c9ae64c81
  1. 3
      lib/diff.tcl

3
lib/diff.tcl

@ -417,8 +417,7 @@ proc read_diff {fd conflict_size cont_info} {
# #
if {[string match {@@@ *} $line]} {set is_3way_diff 1} if {[string match {@@@ *} $line]} {set is_3way_diff 1}


if {[string match {mode *} $line] if {[string match {new file *} $line]
|| [string match {new file *} $line]
|| [regexp {^(old|new) mode *} $line] || [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line] || [string match {deleted file *} $line]
|| [string match {deleted symlink} $line] || [string match {deleted symlink} $line]

Loading…
Cancel
Save