git-gui: move 3way diff autodetect up
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
963ceab57e0743ed76889b93d051dee828eed859
1 file changed
+4
-3
lib/diff.tcl
+4
-3
@@ -393,6 +393,10 @@ proc read_diff {fd conflict_size cont_info} {
393
#
394
if {[regexp {^@@+ } $line]} {set ::current_diff_inheader 0}
395
396
+ # -- Automatically detect if this is a 3 way diff.
397
+ #
398
+ if {[string match {@@@ *} $line]} {set is_3way_diff 1}
399
+
400
if {$::current_diff_inheader} {
401
append current_diff_header $line "\n"
402
@@ -413,9 +417,6 @@ proc read_diff {fd conflict_size cont_info} {
417
}
418
419
416
- # -- Automatically detect if this is a 3 way diff.
417
- #
418
- if {[string match {@@@ *} $line]} {set is_3way_diff 1}
420
421
if {[string match {new file *} $line]
422
|| [regexp {^(old|new) mode *} $line]