summaryrefslogtreecommitdiffstats
path: root/src/files.ml
diff options
context:
space:
mode:
Diffstat (limited to 'src/files.ml')
-rw-r--r--src/files.ml3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/files.ml b/src/files.ml
index 62cf3ed..1d1bfc9 100644
--- a/src/files.ml
+++ b/src/files.ml
@@ -733,7 +733,8 @@ let formatMergeCmd p f1 f2 backup out1 out2 outarch =
let cooked = Util.replacesubstring cooked "NEW2" out2 in
let cooked = Util.replacesubstring cooked "NEWARCH" outarch in
let cooked = Util.replacesubstring cooked "NEW" out1 in
- let cooked = Util.replacesubstring cooked "PATH" (Path.toString p) in
+ let cooked = Util.replacesubstring cooked "PATH"
+ (Uutil.quotes (Path.toString p)) in
cooked
let copyBack fspathFrom pathFrom rootTo pathTo propsTo uiTo id =