chiark / gitweb /
Fix merge failure handling in tg export