chiark / gitweb /
wip merge complex - fix bug, improve merge ends condition