From 8ce03164842d250f1cf1dfbf9a245fd030195e24 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sun, 21 Jan 2007 23:11:47 -0500 Subject: [PATCH] git-gui: Don't format the mode line of a diff. We sometimes see a mode line show up in a diff if the file mode was changed. But its not something we format specially. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-gui.sh b/git-gui.sh index d71fcd8220..396a44e654 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -709,6 +709,7 @@ proc read_diff {fd} { if {[string match {@@@ *} $line]} {set is_3way_diff 1} if {[string match {index *} $line] + || [string match {mode *} $line] || [regexp {^\* Unmerged path } $line]} { set tags {} } elseif {$is_3way_diff} { -- 2.11.4.GIT