mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Jacob Nisnevich](/assets/img/avatar_default.png)
Signed-off-by: Jacob Nisnevich <jacob.nisnevich@gmail.com> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
19 lines
370 B
Plaintext
19 lines
370 B
Plaintext
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"
|
|
}
|