Skip to content

Commit d1ea0f7

Browse files
committed
Merge branch 'ah/mergetols-vscode'
"git mergetool" learned to use VSCode as a merge backend. * ah/mergetols-vscode: mergetools: vscode: new tool
2 parents f4806a9 + 6b77283 commit d1ea0f7

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

mergetools/vscode

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff_cmd () {
2+
"$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
3+
}
4+
5+
diff_cmd_help () {
6+
echo "Use Visual Studio Code (requires a graphical session)"
7+
}
8+
9+
merge_cmd () {
10+
"$merge_tool_path" --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED"
11+
}
12+
13+
merge_cmd_help () {
14+
echo "Use Visual Studio Code (requires a graphical session)"
15+
}
16+
17+
translate_merge_tool_path () {
18+
echo code
19+
}

0 commit comments

Comments
 (0)