diff --git a/git-gui.sh b/git-gui.sh index 2350baa3a3..d697d1ebe2 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -704,6 +704,8 @@ proc read_diff {fd} { if {[string match {index *} $line] || [string match {mode *} $line] + || [string match {new file *} $line] + || [string match {deleted file *} $line] || [regexp {^\* Unmerged path } $line]} { set tags {} } elseif {$is_3way_diff} {