diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:47:53 +0000 |
| commit | c8bae7493d2f2910b57f13ded012e86bdcfb0532 (patch) | |
| tree | 24e09d9f84dec336720cf393e156089ca2835791 /mergetools/examdiff | |
| parent | Initial commit. (diff) | |
| download | git-upstream/1%2.39.2.tar.xz git-upstream/1%2.39.2.zip | |
Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mergetools/examdiff')
| -rw-r--r-- | mergetools/examdiff | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 0000000..6f53ca9 --- /dev/null +++ b/mergetools/examdiff @@ -0,0 +1,24 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" -nh +} + +diff_cmd_help () { + echo "Use ExamDiff Pro (requires a graphical session)" +} + +merge_cmd () { + 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 +} + +merge_cmd_help () { + echo "Use ExamDiff Pro (requires a graphical session)" +} + +translate_merge_tool_path() { + mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" +} |