diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-09 21:47:56 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-28 09:01:17 +0000 |
| commit | 963ceab57e0743ed76889b93d051dee828eed859 (patch) | |
| tree | ad549e76836308c6e9237b69569045e415768e47 | |
| parent | 3c9ae64c81bf6261fa9b19de5b6134e321905838 (diff) | |
| download | git-963ceab57e0743ed76889b93d051dee828eed859.tar.gz git-963ceab57e0743ed76889b93d051dee828eed859.tar.xz | |
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>
| -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] |