chiark / gitweb /
merge: add non-cyclic Condition to Base Merge (although I think it's implied by Merge...