H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-08 18:43:53 +00:00
Code Releases Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Shawn O. Pearce 2009-03-20 14:44:48 -07:00
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]