Server IP : 66.29.132.124 / Your IP : 3.137.200.56 Web Server : LiteSpeed System : Linux business141.web-hosting.com 4.18.0-553.lve.el8.x86_64 #1 SMP Mon May 27 15:27:34 UTC 2024 x86_64 User : wavevlvu ( 1524) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON | Sudo : OFF | Pkexec : OFF Directory : /usr/libexec/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 }