Server : Apache System : Linux dedi-14684855.grupobig.com 5.14.0-611.49.1.el9_7.x86_64 #1 SMP PREEMPT_DYNAMIC Tue Apr 21 16:39:08 EDT 2026 x86_64 User : grupo692 ( 1004) PHP Version : 8.2.31 Disable Function : NONE Directory :  /usr/libexec/git-core/mergetools/

Upload File : current_dir [ Writeable ] document_root [ Writeable ]

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
}