chiark / gitweb /
resolved: actually, the peer with the lower IP address wins conflicts