Revision 773e25afc41b1b6533fa9ae2cd825d0b4a697fad authored by Junio C Hamano on 08 February 2021, 22:05:35 UTC, committed by Junio C Hamano on 08 February 2021, 22:05:55 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dadf9e5
examdiff
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
else
"$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
fi
}
translate_merge_tool_path() {
mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}
Computing file changes ...