chiark / gitweb /
improve merge ends formatting