|
Server : Apache System : Linux vps-1289444.devslamantis.cl 3.10.0-1160.139.1.el7.tuxcare.els2.x86_64 #1 SMP Mon Nov 3 13:30:41 UTC 2025 x86_64 User : vspt ( 1013) PHP Version : 7.4.33 Disable Function : NONE Directory : /usr/libexec/git-core/mergetools/ |
can_merge () {
return 1
}
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}