chiark / gitweb /
Rename \merge to \mergeof so we can have \merge