| Server IP : 217.160.0.32 / Your IP : 216.73.216.38 Web Server : Apache System : Linux info 3.0 #1337 SMP Tue Jan 01 00:00:00 CEST 2000 all GNU/Linux User : u75532419 ( 2865557) PHP Version : 8.2.32 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /lib/git-core/mergetools/ |
Upload File : |
can_merge () {
return 1
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
exit_code_trustable () {
true
}