diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-09 21:47:55 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-28 09:01:17 +0000 |
| commit | 3c9ae64c81bf6261fa9b19de5b6134e321905838 (patch) | |
| tree | cf2be66914f0e890d3e786b00c34bbbf24f90b83 | |
| parent | 97b8ee167154b66ec59367d3cc6d6abf5a996440 (diff) | |
| download | git-3c9ae64c81bf6261fa9b19de5b6134e321905838.tar.gz git-3c9ae64c81bf6261fa9b19de5b6134e321905838.tar.xz | |
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>
| -rw-r--r-- | lib/diff.tcl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index aa300891a..20f50ddab 100644 --- a/lib/diff.tcl +++ b/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 {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] |