Merge branch 'maint'

git-mirror · Mar 20, 2009 · b0d644b · b0d644b
2 parents 73fea17 + e27430e
commit b0d644b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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]