I'm super psyched by this and hope others check it out:
2011 Feb 07 | MW: a command line interface to MediaWiki
Recently, I stumbled upon Ian Weller's mw, "VCS-like nonsense for MediaWiki
websites". He provides a great foundation and the basic pull, diff, commit and status
commands. Since it's written in Python, I could actually grok it, extend pull so it
can pull new updates and warn of conflicts, and provide simple merge functionality.
You can see examples of the pull, conflict, and merge functionality in a short MW
tutorial I drafted.