undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: move 3way diff autodetect up

Browse Source 
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Bert Wesarg 2010-12-09 21:47:56 +01:00 committed by Pat Thoyts
parent 3c9ae64c81
commit 963ceab57e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/diff.tcl
View File

@ -393,6 +393,10 @@ proc read_diff {fd conflict_size cont_info} {
# #
if {[regexp {^@@+ } $line]} {set ::current_diff_inheader 0} 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} { if {$::current_diff_inheader} {
append current_diff_header $line "\n" 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] if {[string match {new file *} $line]
|| [regexp {^(old|new) mode *} $line] || [regexp {^(old|new) mode *} $line]