chiark / gitweb /
Prove that plain git merges on non-tb branches are ok