diff options
| -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 aa300891aa..20f50ddab2 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] |