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.
-### [[Json.tl.ph]], editing pages in a web browser
+### [[RecentChanges]], editing pages in a web browser
Nearly the definition of a wiki, although perhaps ikiwiki challenges how
much of that web gunk a wiki really needs. These features are optional