diff options
Diffstat (limited to 'mergetools/tortoisemerge')
| -rw-r--r-- | mergetools/tortoisemerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index d7ab666a59..507edcd444 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -2,6 +2,10 @@ can_diff () { return 1 } +diff_cmd_help () { + echo "Use TortoiseMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -30,3 +34,7 @@ translate_merge_tool_path() { echo tortoisemerge fi } + +merge_cmd_help () { + echo "Use TortoiseMerge (requires a graphical session)" +} |