| Server IP : 78.140.185.180 / Your IP : 18.221.20.252 Web Server : LiteSpeed System : Linux cpanel13.v.fozzy.com 4.18.0-513.11.1.lve.el8.x86_64 #1 SMP Thu Jan 18 16:21:02 UTC 2024 x86_64 User : builderbox ( 1072) PHP Version : 7.3.33 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : ON | Sudo : OFF | Pkexec : OFF Directory : /proc/self/root/proc/2905953/root/usr/libexec/git-core/mergetools/ |
Upload File : |
can_diff () {
return 1
}
diff_cmd_help () {
echo "Use TortoiseMerge (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
basename="$(basename "$merge_tool_path" .exe)"
if test "$basename" = "tortoisegitmerge"
then
"$merge_tool_path" \
-base "$BASE" -mine "$LOCAL" \
-theirs "$REMOTE" -merged "$MERGED"
else
"$merge_tool_path" \
-base:"$BASE" -mine:"$LOCAL" \
-theirs:"$REMOTE" -merged:"$MERGED"
fi
else
echo "$merge_tool_path cannot be used without a base" 1>&2
return 1
fi
}
translate_merge_tool_path() {
if type tortoisegitmerge >/dev/null 2>/dev/null
then
echo tortoisegitmerge
else
echo tortoisemerge
fi
}
merge_cmd_help () {
echo "Use TortoiseMerge (requires a graphical session)"
}