| 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 | } |