# Derived/append-only files: prefer line-union on merge to minimise conflicts.
# (The real conflict-avoidance is structural: log entries are one-file-per-event,
#  and index.md is regenerated with `mywiki reindex`. Union merge is just a backstop.)
wiki/index.md   merge=union
wiki/log/*.md   merge=union
