diff options
| author | Jacob Nisnevich <jacob.nisnevich@gmail.com> | 2016-03-25 16:17:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-04 09:15:14 -0700 |
| commit | 35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b (patch) | |
| tree | 76de42aeff430ff2fc56e55acc784c9a9c6e757d /mergetools | |
| parent | e36d716751d3477694325e1ff2ece33747133a5b (diff) | |
| download | git-35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b.tar.gz git-35d62bbe3e9ec6388f8f4077c3c6c0767e8d984b.tar.xz | |
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>
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/examdiff | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000000000..7b524d408 --- /dev/null +++ b/mergetools/examdiff @@ -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" +} |