A wiki that is backed by bazaar that allows local branching of the wiki for later merging. it doesn't have any page locks and uses bazaar's three way merging.