chiark / gitweb /
wip merge before rejoin tip merge condition