| Server IP : 82.180.147.116 / Your IP : 216.73.216.4 Web Server : Apache System : Linux server.vsyshosting.com 5.14.0-503.40.1.el9_5.x86_64 #1 SMP PREEMPT_DYNAMIC Mon May 5 06:06:04 EDT 2025 x86_64 User : demoplace ( 1009) PHP Version : 7.4.33 Disable Function : exec,passthru,shell_exec,system MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /proc/1843192/root/proc/1843192/root/usr/libexec/git-core/mergetools/ |
Upload File : |
diff_cmd () {
"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use ECMerge (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
--default --mode=merge3 --to="$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
--default --mode=merge2 --to="$MERGED"
fi
}
merge_cmd_help () {
echo "Use ECMerge (requires a graphical session)"
}