mirror of
https://github.com/Xevion/dotfiles.git
synced 2025-12-06 01:14:48 -06:00
Use VS Code for merges
This commit is contained in:
@@ -24,6 +24,13 @@
|
||||
{{- $cpuThreads = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "(Get-CimInstance -ClassName 'Win32_Processor').NumberOfLogicalProcessors") | trim | atoi }}
|
||||
{{- end -}}
|
||||
|
||||
[merge]
|
||||
command = "bash"
|
||||
args = [
|
||||
"-c",
|
||||
"cp {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base && code --new-window --wait --merge {{ "{{" }} .Destination {{ "}}" }} {{ "{{" }} .Target {{ "}}" }} {{ "{{" }} .Target {{ "}}" }}.base {{ "{{" }} .Source {{ "}}" }}",
|
||||
]
|
||||
|
||||
[data]
|
||||
chassis = "{{ $chassisType }}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user