|
Server IP : 2a02:4780:3:1493:0:3736:a38e:7 / Your IP : 216.73.216.112 Web Server : LiteSpeed System : Linux sg-nme-web1393.main-hosting.eu 4.18.0-553.40.1.lve.el8.x86_64 #1 SMP Wed Feb 12 18:54:57 UTC 2025 x86_64 User : u926327694 ( 926327694) PHP Version : 7.4.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : OFF | Python : OFF Directory (0755) : /usr/libexec/git-core/mergetools/ |
| [ Home ] | [ C0mmand ] | [ Upload File ] |
|---|
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
diff_cmd_help () {
echo "Use Beyond Compare (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-mergeoutput="$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-mergeoutput="$MERGED"
fi
}
merge_cmd_help () {
echo "Use Beyond Compare (requires a graphical session)"
}
translate_merge_tool_path() {
if type bcomp >/dev/null 2>/dev/null
then
echo bcomp
else
echo bcompare
fi
}
list_tool_variants () {
echo bc
echo bc3
echo bc4
}