diff options
Diffstat (limited to 'mergetools/bc')
| -rw-r--r-- | mergetools/bc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mergetools/bc b/mergetools/bc index 3a69e60..2922667 100644 --- a/mergetools/bc +++ b/mergetools/bc @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } +diff_cmd_help () { + echo "Use Beyond Compare (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -13,6 +17,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use Beyond Compare (requires a graphical session)" +} + translate_merge_tool_path() { if type bcomp >/dev/null 2>/dev/null then @@ -21,3 +29,9 @@ translate_merge_tool_path() { echo bcompare fi } + +list_tool_variants () { + echo bc + echo bc3 + echo bc4 +} |