I'm looking for a wiki software which allows me to
- store wiki pages on a server (basic wiki functionality)
- store a local copy on my computer
- edit my local content, and then merge my changes back to the server
- (version control for conflicting update)
Is there a wiki, or a set of software which allows me to do this? The primary platform is linux, but I wouldn't mind if it also ran on windows...