builtin/merge.c: free "&buf" on "Your local changes..." error

[thirdparty/git.git] / git-mergetool--lib.sh

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 542a6a75eb3c4b93d8b4a394551d5d38d2a88f6e..9f99201bcca1eada84c3f19d1ca44cb41b3f3c59 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -63,7 +63,7 @@ $(list_tool_variants)"
                                        preamble=
                                fi
                                shown_any=yes
-                               printf "%s%s\n" "$per_line_prefix" "$toolname"
+                               printf "%s%-15s  %s\n" "$per_line_prefix" "$toolname" $(diff_mode && diff_cmd_help "$toolname" || merge_cmd_help "$toolname")
                        fi
                done
 
@@ -162,10 +162,18 @@ setup_tool () {
                return 1
        }
 
+       diff_cmd_help () {
+               return 0
+       }
+
        merge_cmd () {
                return 1
        }
 
+       merge_cmd_help () {
+               return 0
+       }
+
        hide_resolved_enabled () {
                return 0
        }