diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:24 -0800 |
| commit | 64971f0ac0200d3bb53cb19e7367cf57a40ae1fc (patch) | |
| tree | 4d21d1a12b56d6b2896476d97861209b31faf688 /commit-graph.c | |
| parent | 897d28bcc23878b5d98b46f3903e3d2a302d8a01 (diff) | |
| parent | 80f5a16798b7ff224aeab4a6b6e3627446071345 (diff) | |
Merge branch 'pb/mergetool-tool-help-fix' into maint
Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
* pb/mergetool-tool-help-fix:
mergetool--lib: fix '--tool-help' to correctly show available tools
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions