| Server IP : 198.38.94.13 / Your IP : 216.73.217.33 Web Server : Apache System : Linux d4744.dxb1.stableserver.net 5.14.0-611.49.1.el9_7.x86_64 #1 SMP PREEMPT_DYNAMIC Tue Apr 21 16:39:08 EDT 2026 x86_64 User : revivere ( 1140) PHP Version : 8.2.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /proc/698866/root/usr/libexec/git-core/mergetools/ |
Upload File : |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
diff_cmd_help () {
echo "Use Diffuse (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" \
"$BASE" | cat
else
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
}
merge_cmd_help () {
echo "Use Diffuse (requires a graphical session)"
}