chiark / gitweb /
Deal with merge conflicts directly