shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn.
+ For all the gory details of how ikiwiki handles this behind the scenes,
+ see [[commit-internals]].
+
* page locking
Wiki admins can lock pages so that only other admins can edit them.