kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint'

maint
Shawn O. Pearce 2009-03-20 14:44:48 -07:00
parent 73fea17364 e27430e777
commit b0d644b658
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mergetool.tcl
View File

@ -88,7 +88,7 @@ proc merge_load_stages {path cont} {
set merge_stages(3) {}
set merge_stages_buf {}

set merge_stages_fd [eval git_read ls-files -u -z -- $path]
set merge_stages_fd [eval git_read ls-files -u -z -- {$path}]

fconfigure $merge_stages_fd -blocking 0 -translation binary -encoding binary
fileevent $merge_stages_fd readable [list read_merge_stages $merge_stages_fd $cont]