| Server IP : 185.143.233.238 / Your IP : 185.215.232.195 Web Server : Apache System : Linux 81-12-52-146.cprapid.com 4.18.0-553.76.1.lve.el8.x86_64 #1 SMP Wed Oct 1 16:05:07 UTC 2025 x86_64 User : noavaranesama ( 1039) PHP Version : 8.2.29 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON | Sudo : ON | Pkexec : ON 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)"
}