Browse Source
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>maint
Jacob Nisnevich
9 years ago
committed by
Junio C Hamano
1 changed files with 18 additions and 0 deletions
@ -0,0 +1,18 @@
@@ -0,0 +1,18 @@
|
||||
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" |
||||
} |
Loading…
Reference in new issue