|
Server IP : 161.35.85.9 / Your IP : 216.73.217.138 Web Server : nginx/1.30.4 System : Linux cheapdeb-ams3 7.1.13+deb14-amd64 #1 SMP PREEMPT_DYNAMIC Debian 7.1.13-1 (2026-09-03) x86_64 User : root ( 0) PHP Version : 8.2.18 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON Directory (0755) : /usr/lib/git-core/mergetools/ |
| [ Home ] | [ C0mmand ] | [ Upload File ] |
|---|
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use Guiffy's Diff Tool (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -s "$LOCAL" \
"$REMOTE" "$BASE" "$MERGED"
else
"$merge_tool_path" -m "$LOCAL" \
"$REMOTE" "$MERGED"
fi
}
merge_cmd_help () {
echo "Use Guiffy's Diff Tool (requires a graphical session)"
}
exit_code_trustable () {
true
}