summaryrefslogtreecommitdiff
path: root/git-gui/lib/diff.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-05 06:03:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-05 06:03:42 (GMT)
commit144126abf99f2eac48e63b7ea85a8f3f99f814db (patch)
treecde92eb4fca39d059a0a370ed7790af53bd9a839 /git-gui/lib/diff.tcl
parentcf9d58e4f388dc173b86143fbfe0eac114e3ed2f (diff)
parenta6d5888fa1bb24ef34ce36f0e684d13a58eba908 (diff)
downloadgit-144126abf99f2eac48e63b7ea85a8f3f99f814db.zip
git-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.gz
git-144126abf99f2eac48e63b7ea85a8f3f99f814db.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Make commit log messages end with a newline Added Swedish translation. git-gui: Unconditionally use absolute paths with Cygwin git-gui: Handle file mode changes (644->755) in diff viewer git-gui: Move frequently used commands to the top of the context menu.
Diffstat (limited to 'git-gui/lib/diff.tcl')
-rw-r--r--git-gui/lib/diff.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 43565e4..18aba3e 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -220,6 +220,7 @@ proc read_diff {fd} {
if {[string match {mode *} $line]
|| [string match {new file *} $line]
+ || [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line]
|| [string match {deleted symlink} $line]
|| [string match {Binary files * and * differ} $line]