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 /mergetools | |
| parent | The eleventh batch (diff) | |
| download | git-6b77283f5e7fffcc74c032f2e692aaab1ddbe58a.tar.gz git-6b77283f5e7fffcc74c032f2e692aaab1ddbe58a.zip | |
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 'mergetools')
| -rw-r--r-- | mergetools/vscode | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mergetools/vscode b/mergetools/vscode new file mode 100644 index 0000000000..3b39b458d6 --- /dev/null +++ b/mergetools/vscode @@ -0,0 +1,19 @@ +diff_cmd () { + "$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE" +} + +diff_cmd_help () { + echo "Use Visual Studio Code (requires a graphical session)" +} + +merge_cmd () { + "$merge_tool_path" --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED" +} + +merge_cmd_help () { + echo "Use Visual Studio Code (requires a graphical session)" +} + +translate_merge_tool_path () { + echo code +} |