diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-07-27 09:15:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 12:15:40 -0400 |
| commit | eb6b837d65ba1c7ca949c19a199c4c83e296ca5f (patch) | |
| tree | a7d091f20f31764fe347014bcf1b8ebbcb453f22 /docs/tutorial/merging.md | |
| parent | 9e85f5545a290c0bc113ba9b8a12bb7c56130e59 (diff) | |
Clang-Format 14 (#1321)
* format
* Update dockerfile and other documentation
* Update mac instructions
Diffstat (limited to 'docs/tutorial/merging.md')
| -rw-r--r-- | docs/tutorial/merging.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorial/merging.md b/docs/tutorial/merging.md index b7745b509..ba0d043f9 100644 --- a/docs/tutorial/merging.md +++ b/docs/tutorial/merging.md @@ -64,7 +64,7 @@ Ideally you should at least be able to get a function to have equivalent behavio ### Format -Run the formatting script `format.sh`, to format the C files in the standard way we use. If you have some arrays or struct definitions in your file, check that they have not been obnoxiously padded out: you can usually get a better format without a final comma for short things. +Run the formatting script `format.py`, to format the C files in the standard way we use. If you have some arrays or struct definitions in your file, check that they have not been obnoxiously padded out: you can usually get a better format without a final comma for short things. **N.B.** this is now essential: the CI will fail immediately if it detects files that change when formatted. |