| Server IP : 37.9.174.138 / Your IP : 216.73.216.117 Web Server : Apache System : Linux vps6.backend.sk 6.12.100+deb13-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.100-1 (2026-07-30) x86_64 User : ftpuser ( 1001) PHP Version : 8.4.24 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /usr/lib/git-core/mergetools/ |
Upload File : |
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
}