chiark / gitweb /
wip merge complex - reformulate merge ends conditions