mergetools: add description to all diff/merge tools

[thirdparty/git.git] / mergetools / p4merge

diff --git a/mergetools/p4merge b/mergetools/p4merge
index 7a5b291dd28ad5b60ca0492480b800aaa9cc929e..f3cb197e5876e1a667e97189fff71fd355ccab30 100644 (file)
--- 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)"
+}