summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3596fd)
raw | patch | inline | side by side (parent: d3596fd)
author | Shawn O. Pearce <spearce@spearce.org> | |
Tue, 23 Jan 2007 08:25:17 +0000 (03:25 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Tue, 23 Jan 2007 08:25:17 +0000 (03:25 -0500) |
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh | patch | blob | history |
diff --git a/git-gui.sh b/git-gui.sh
index 37757cfb6522a69b2e3150b8a81eab284b9f874d..c6757045ab07e87fe5cd687bd44a7c9e4c577e82 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
|| [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 {}