mergetools/vscode


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
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
}