diff options
Diffstat (limited to 'mergetools/winmerge')
| -rw-r--r-- | mergetools/winmerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/winmerge b/mergetools/winmerge index 74d0325..36c72dd 100644 --- a/mergetools/winmerge +++ b/mergetools/winmerge @@ -3,6 +3,10 @@ diff_cmd () { return 0 } +diff_cmd_help () { + echo "Use WinMerge (requires a graphical session)" +} + merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. @@ -13,3 +17,7 @@ merge_cmd () { translate_merge_tool_path() { mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge" } + +merge_cmd_help () { + echo "Use WinMerge (requires a graphical session)" +} |