Revision 6d5b26420848ec3bc7eae46a7ffa54f20276249d authored by Junio C Hamano on 09 July 2019, 22:48:36 UTC, committed by Junio C Hamano on 09 July 2019, 22:48:36 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent cde9a64
diffmerge
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" --merge --result="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
"$merge_tool_path" --merge \
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
}
exit_code_trustable () {
true
}
Computing file changes ...