diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2024-09-01 20:59:14 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-01 20:47:58 -0700 |
| commit | 6b77283f5e7fffcc74c032f2e692aaab1ddbe58a (patch) | |
| tree | 18db76d0f6da4def88bd5ba0ec5f543185ad3b2a /pack-bitmap-write.c | |
| parent | 4590f2e9412378c61eac95966709c78766d326ba (diff) | |
mergetools: vscode: new tool
VSCode has supported three-way merges since 2022, see
<https://github.com/microsoft/vscode/issues/5770#issuecomment-1188658476>.
Although the program binary is located at /usr/bin/code, name the
mergetool "vscode" because the word "code" is too generic and would lead
to confusion. The name "vscode" also matches Git's existing
contrib/vscode directory.
On Windows, VSCode adds the directory that contains code.cmd to %PATH%,
so there is no need to invoke mergetool_find_win32_cmd to search for the
program.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap-write.c')
0 files changed, 0 insertions, 0 deletions