Sync with 'maint'
[git/gitster.git] / mergetools / vscode
blob3b39b458d6ae11c53e0049fe589662939cd90609
1 diff_cmd () {
2         "$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
5 diff_cmd_help () {
6         echo "Use Visual Studio Code (requires a graphical session)"
9 merge_cmd () {
10         "$merge_tool_path" --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED"
13 merge_cmd_help () {
14         echo "Use Visual Studio Code (requires a graphical session)"
17 translate_merge_tool_path () {
18         echo code