diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2009-03-20 14:44:48 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-03-20 14:44:48 -0700 |
| commit | b0d644b6585d68b5324310982373b6b9b1316f5e (patch) | |
| tree | f4a1aa95c7ae30be73480667c0aafb980219e34b | |
| parent | 73fea1736495fb07b7ad000ddc585bcff8f0b72b (diff) | |
| parent | e27430e777edeb777cdd02a777e1e3a4608a0b41 (diff) | |
| download | git-b0d644b6585d68b5324310982373b6b9b1316f5e.tar.gz git-b0d644b6585d68b5324310982373b6b9b1316f5e.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | lib/mergetool.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index eb2b4b56a..3e1b42beb 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -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] |