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>

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 20f50ddab2ca7b0fc8d3abec95b74591a1377ceb..22909194d97477febb94291a55a4b8f438bf6c68 100644 (file)
--- 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]