--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.txt	Sat May 14 00:57:13 2011 +0200
@@ -0,0 +1,3 @@
+This is a simple library that lets you store versioned strings in a Mercurial
+repository. It should be suitable for use in Mercurial-based web applications
+such as wiki engines.

--- a/hgstorage.py	Sat May 14 00:32:05 2011 +0200
+++ b/hgstorage.py	Sat May 14 00:57:13 2011 +0200
@@ -1,14 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+"""
+A persistent, versioned, string storage based on a Mercurial repository.
+"""
+
 import os
 import thread
 import urllib
 import datetime
 import weakref
 
+# This needs to be defined before importing Mercurial
 os.environ['HGENCODING'] = 'utf8'
-os.environ['HGMERGE'] = "internal:merge"
 
 import mercurial.hg
 import mercurial.ui