diff options
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 20f50ddab..22909194d 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -393,6 +393,10 @@ proc read_diff {fd conflict_size cont_info} { # if {[regexp {^@@+ } $line]} {set ::current_diff_inheader 0} + # -- Automatically detect if this is a 3 way diff. + # + if {[string match {@@@ *} $line]} {set is_3way_diff 1} + if {$::current_diff_inheader} { append current_diff_header $line "\n" @@ -413,9 +417,6 @@ proc read_diff {fd conflict_size cont_info} { } - # -- Automatically detect if this is a 3 way diff. - # - if {[string match {@@@ *} $line]} {set is_3way_diff 1} if {[string match {new file *} $line] || [regexp {^(old|new) mode *} $line] |