| Server IP : 217.160.0.135 / Your IP : 216.73.216.90 Web Server : Apache System : Linux www 6.18.52-i1-ampere #1203 SMP Mon Sep 14 18:29:59 CEST 2026 aarch64 User : sws1074145052 ( 1074145052) PHP Version : 8.3.32 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/lib/git-core/mergetools/ |
Upload File : |
can_merge () {
return 1
}
diff_cmd_help () {
echo "Use Kompare (requires a graphical session)"
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd_help () {
echo "Use Kompare (requires a graphical session)"
}
exit_code_trustable () {
true
}