File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
assets/chezmoi.io/docs/user-guide/tools Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ To use [VSCode][vscode] as the merge tool, add the following to your config:
6767 command = "bash"
6868 args = [
6969 "-c",
70- "cp {{ .Target }} {{ .Target }}.base && code --new-window --wait --merge {{ .Destination }} {{ .Target }} {{ .Target }}.base {{ .Source }}",
70+ "cp \" {{ .Target }}\" \" {{ .Target }}.base\" && code --new-window --wait --merge \" {{ .Destination }}\" \" {{ .Target }}\" \" {{ .Target }}.base\" \" {{ .Source }}\" ",
7171 ]
7272 ```
7373
@@ -78,7 +78,7 @@ To use [VSCode][vscode] as the merge tool, add the following to your config:
7878 command: "bash"
7979 args:
8080 - "-c"
81- - "cp {{ .Target }} {{ .Target }}.base && code --new-window --wait --merge {{ .Destination }} {{ .Target }} {{ .Target }}.base {{ .Source }}"
81+ - "cp \" {{ .Target }}\" \" {{ .Target }}.base\" && code --new-window --wait --merge \" {{ .Destination }}\" \" {{ .Target }}\" \" {{ .Target }}.base\" \" {{ .Source }}\" "
8282 ```
8383
8484[ bcomp ] : https://www.scootersoftware.com/
You can’t perform that action at this time.
0 commit comments