提交 35d62bbe 编写于 作者: J Jacob Nisnevich 提交者: Junio C Hamano

mergetools: add support for ExamDiff

Signed-off-by: NJacob Nisnevich <jacob.nisnevich@gmail.com>
Acked-by: NDavid Aguilar <davvid@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 e36d7167
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" -nh
}
merge_cmd () {
touch "$BACKUP"
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
check_unchanged
}
translate_merge_tool_path() {
mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册