Merge branch 'maint'

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 9cb9d0604a4905337dc0c57d8d846753a3157c8a..e09e1257e1be299caceb0c6f0074c1b43b566974 100644 (file)
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -86,6 +86,7 @@ proc show_diff {path w {lno {}}} {
                set max_sz [expr {128 * 1024}]
                if {[catch {
                                set fd [open $path r]
+                               fconfigure $fd -eofchar {}
                                set content [read $fd $max_sz]
                                close $fd
                                set sz [file size $path]