Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Ignore 'No newline at end of file' marker line.
[gitweb.git]
/
git-gui.sh
diff --git
a/git-gui.sh
b/git-gui.sh
index bbf57b96a0632ab43722b5f3d6b9e4752dafae6e..54204aee782681674cd005f5c38a7dbe14b45026 100755
(executable)
--- a/
git-gui.sh
+++ b/
git-gui.sh
@@
-706,6
+706,7
@@
proc read_diff {fd} {
|| [string match {mode *} $line]
|| [string match {new file *} $line]
|| [string match {deleted file *} $line]
+ || $line eq {\ No newline at end of file}
|| [regexp {^\* Unmerged path } $line]} {
set tags {}
} elseif {$is_3way_diff} {