Server IP : 2a02:4780:3:1378:0:3736:a38e:10 / Your IP : 18.222.226.47 Web Server : LiteSpeed System : Linux sg-nme-web1278.main-hosting.eu 4.18.0-513.11.1.lve.el8.x86_64 #1 SMP Thu Jan 18 16:21:02 UTC 2024 x86_64 User : u926327694 ( 926327694) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : OFF | Python : OFF Directory (0755) : /usr/libexec/git-core/mergetools/ |
[ Home ] | [ C0mmand ] | [ Upload File ] |
---|
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" -nh } diff_cmd_help () { echo "Use ExamDiff Pro (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh else "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh fi } merge_cmd_help () { echo "Use ExamDiff Pro (requires a graphical session)" } translate_merge_tool_path() { mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" }