chiark / gitweb /
notation: clarify git merge notations