chiark / gitweb /
some alternative formulations of \merge