chiark / gitweb /
emerge-hack: A new script for Git merging.