Server : Apache/2.4.6 (CentOS) OpenSSL/1.0.2k-fips PHP/7.4.20 System : Linux st2.domain.com 3.10.0-1127.10.1.el7.x86_64 #1 SMP Wed Jun 3 14:28:03 UTC 2020 x86_64 User : apache ( 48) PHP Version : 7.4.20 Disable Function : NONE Directory : /proc/self/root/usr/libexec/git-core/mergetools/ |
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
merge_cmd () {
# Adding $(pwd)/ in front of $MERGED should not be necessary.
# However without it, DeltaWalker (at least v1.9.8 on Windows)
# crashes with a JRE exception. The DeltaWalker user manual,
# shows $(pwd)/ whenever the '-merged' options is given.
# Adding it here seems to work around the problem.
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
else
"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
fi >/dev/null 2>&1
}
translate_merge_tool_path() {
echo DeltaWalker
}