diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-23 03:25:17 -0500 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-23 03:25:17 -0500 |
commit | 4e62e2725e487b515a57e1c6ae5ef9b81546884d (patch) | |
tree | 3f1e5040877c6688c7fb62f2829a000e64b010e6 | |
parent | d3596fd9486b602252d5b2c3e14ac55a07a2bdb9 (diff) | |
download | git-4e62e2725e487b515a57e1c6ae5ef9b81546884d.tar.gz git-4e62e2725e487b515a57e1c6ae5ef9b81546884d.tar.xz |
git-gui: Don't try to tag the 'Binary files * and * differ' line.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-x | git-gui.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 37757cfb6..c6757045a 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 {} |