mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-06 12:16:14 +02:00
Code

mergetools: add support for ExamDiff 

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>
This commit is contained in:
Jacob Nisnevich 2016-03-25 16:17:57 -07:00 committed by Junio C Hamano
parent e36d716751
commit 35d62bbe3e
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mergetools/examdiff Normal file
View File

@ -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"
}