A wiki that is backed by Git or Bazaar and allows local branching of the wiki for later merging.

It doesn't have any page locks and uses three way merging.