| Server IP : 198.38.94.67 / Your IP : 216.73.217.178 Web Server : LiteSpeed System : Linux d6054.dxb1.stableserver.net 5.14.0-570.25.1.el9_6.x86_64 #1 SMP PREEMPT_DYNAMIC Wed Jul 9 04:57:09 EDT 2025 x86_64 User : azfilmst ( 1070) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /proc/thread-self/root/usr/libexec/git-core/mergetools/ |
Upload File : |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use TkDiff (requires a graphical session)"
}
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
}
merge_cmd_help () {
echo "Use TkDiff (requires a graphical session)"
}