summaryrefslogtreecommitdiff
path: root/docs/tutorial/merging.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorial/merging.md')
-rw-r--r--docs/tutorial/merging.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorial/merging.md b/docs/tutorial/merging.md
index f2554d31e..a5e7b66f6 100644
--- a/docs/tutorial/merging.md
+++ b/docs/tutorial/merging.md
@@ -59,7 +59,7 @@ If you can't match a function even with everyone's, don't worry overlong about i
### Format
-Run the formatting script `format.sh`, to format the C files in the standard way we use.
+Run the formatting script `format.py`, to format the C files in the standard way we use.
### Merge master