Heray-Was-Here
Server : Apache
System : Linux infong-uk56 4.4.400-icpu-108 #2 SMP Wed Feb 11 11:51:01 UTC 2026 x86_64
User : u78863098 ( 10368940)
PHP Version : 8.4.24
Disable Function : NONE
Directory :  /lib/git-core/mergetools/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

Current File : //lib/git-core/mergetools/vscode
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
}

Hry