From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 20 Mar 2009 21:44:48 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc4~1^2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b0d644b6585d68b5324310982373b6b9b1316f5e?hp=73fea1736495fb07b7ad000ddc585bcff8f0b72b

Merge branch 'maint'
---

diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl
index eb2b4b56a4..3e1b42beb0 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]