diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:53 -0800 |
| commit | 2b0f6b1c187742ec6719478a01885ad902456f84 (patch) | |
| tree | 027e967241308d54854408b9780e20a3c1afca91 /builtin/merge-ours.c | |
| parent | Merge branch 'bp/name-hash-dirname-fix' (diff) | |
| parent | CodingGuidelines: mention "static" and "extern" (diff) | |
| download | tgif-2b0f6b1c187742ec6719478a01885ad902456f84.tar.xz | |
Merge branch 'jk/doc-do-not-write-extern'
Devdoc update.
* jk/doc-do-not-write-extern:
CodingGuidelines: mention "static" and "extern"
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions