diff options
Diffstat (limited to 'mergetools/p4merge')
-rw-r--r-- | mergetools/p4merge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge index 7a5b291dd2..f3cb197e58 100644 --- a/mergetools/p4merge +++ b/mergetools/p4merge @@ -19,6 +19,10 @@ diff_cmd () { fi } +diff_cmd_help () { + echo "Use HelixCore P4Merge (requires a graphical session)" +} + merge_cmd () { if ! $base_present then @@ -34,3 +38,7 @@ create_empty_file () { printf "%s" "$empty_file" } + +merge_cmd_help () { + echo "Use HelixCore P4Merge (requires a graphical session)" +} |