diff options
Diffstat (limited to 'mergetools/examdiff')
| -rw-r--r-- | mergetools/examdiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/examdiff b/mergetools/examdiff index e72b06fc4d..6f53ca9161 100644 --- a/mergetools/examdiff +++ b/mergetools/examdiff @@ -2,6 +2,10 @@ 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 @@ -11,6 +15,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use ExamDiff Pro (requires a graphical session)" +} + translate_merge_tool_path() { mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro" } |