I'll be unveiling my thesis work: a wiki that allows for branching and merging. It is built on distributed revision control concepts and tools (i.e., Bazaar) and includes a text-specific merge/conflict resolution system designed for writers. The tool has important potential for offline wiki work, stable versions, and collaboration among forked articles within and between wikis. Think ikiwiki but with distributed revision control and all the branching and merging that goes along with it. I'll be posting lots more information and source here in the coming month.