diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 22:38:23 +0300 |
| commit | f91dbd8b49ce0243ecb86f6ddbbbeff93f63879c (patch) | |
| tree | 9ec729686e613eae458968425558c0fcec3df0ba /builtin/merge-tree.c | |
| parent | 7011ce12b895d172562dcaa7d8b240f3594dc981 (diff) | |
| parent | cc0c42975a2d9159fea5fdd053425492333c1aba (diff) | |
Merge branch 'jc/post-c89-rules-doc' into maint
We have been trying out a few language features outside c89; the
coding guidelines document did not talk about them and instead had
a blanket ban against them.
* jc/post-c89-rules-doc:
CodingGuidelines: spell out post-C89 rules
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions