| Server IP : 192.250.235.158 / Your IP : 216.73.216.143 Web Server : LiteSpeed System : Linux s4099.sgp1.stableserver.net 5.14.0-503.21.1.el9_5.x86_64 #1 SMP PREEMPT_DYNAMIC Sun Jan 12 09:45:05 EST 2025 x86_64 User : vmxfzbqj ( 1905) PHP Version : 8.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/libexec/git-core/mergetools/ |
Upload File : |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
diff_cmd_help () {
echo "Use FileMerge (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-ancestor "$BASE" -merge "$MERGED" | cat
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-merge "$MERGED" | cat
fi
}
merge_cmd_help () {
echo "Use FileMerge (requires a graphical session)"
}