Server : Apache System : Linux enhance01.hostingraja.org 5.15.0-144-generic #157-Ubuntu SMP Mon Jun 16 07:33:10 UTC 2025 x86_64 User : webdemo_4 ( 4864) PHP Version : 7.4.33 Disable Function : NONE Directory : /lib/git-core/mergetools/ |
Upload File : |
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } merge_cmd () { if $base_present then "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" else "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" fi } exit_code_trustable () { true }