diff options
Diffstat (limited to 'mergetools/meld')
| -rw-r--r-- | mergetools/meld | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/meld b/mergetools/meld index aab4ebb935..8ec0867e03 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use Meld (requires a graphical session)" +} + merge_cmd () { check_meld_for_features @@ -20,6 +24,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)" +} + # Get meld help message init_meld_help_msg () { if test -z "$meld_help_msg" |