[PATCH 2/2] mergetools: add support for ExamDiff
From: Jacob Nisnevich <hidden>
Date: 2016-06-15 23:08:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 2/2] mergetools: add support for ExamDiff · Jacob Nisnevich <hidden>
Signed-off-by: Jacob Nisnevich <redacted> --- mergetools/examdiff | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 mergetools/examdiff
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 0000000..7b524d4
--- /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" +}
--
1.9.1