From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Thu, 9 Dec 2010 20:47:55 +0000 (+0100)
Subject: git-gui: there is no "mode *" diff header line
X-Git-Tag: gitgui-0.14.0~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c9ae64c81bf6261fa9b19de5b6134e321905838;p=git.git

git-gui: there is no "mode *" diff header line

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 aa300891a..20f50ddab 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -417,8 +417,7 @@ proc read_diff {fd conflict_size cont_info} {
 		#
 		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 
-		if {[string match {mode *} $line]
-			|| [string match {new file *} $line]
+		if {[string match {new file *} $line]
 			|| [regexp {^(old|new) mode *} $line]
 			|| [string match {deleted file *} $line]
 			|| [string match {deleted symlink} $line]