diff --git a/git-gui.sh b/git-gui.sh index 37757cfb65..c6757045ab 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -734,6 +734,7 @@ proc read_diff {fd} { || [string match {mode *} $line] || [string match {new file *} $line] || [string match {deleted file *} $line] + || [string match {Binary files * and * differ} $line] || $line eq {\ No newline at end of file} || [regexp {^\* Unmerged path } $line]} { set tags {}