diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 22:13:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 22:13:50 +0300 |
| commit | 2e1e569d0ef7507354c57d9b2be4b0f44241a1d4 (patch) | |
| tree | 62a71c22763480885857992d0af40741cf8c3ab1 /merge-recursive.c | |
| parent | 3e6e43e1308d2513864485391df337e156d4b12f (diff) | |
| parent | 9537f21b5568c74e59ba2bf17db966a906d60f9a (diff) | |
Merge branch 'ma/update-hooks-sample-typofix' into maint
* ma/update-hooks-sample-typofix:
templates/hooks: fix minor typo in the sample update-hook
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions