|
Server : Apache System : Linux vps.urbanovitalino.adv.br 3.10.0-1062.12.1.el7.x86_64 #1 SMP Tue Feb 4 23:02:59 UTC 2020 x86_64 User : urbanovitalinoad ( 1001) PHP Version : 7.3.33 Disable Function : exec,passthru,shell_exec,system Directory : /usr/libexec/git-core/mergetools/ |
Upload File : |
can_diff () {
return 1
}
merge_cmd () {
if $base_present
then
touch "$BACKUP"
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
check_unchanged
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
}