log python/hg-merge.py @ 251:c37750a70f94

age author description
2012-02-14 Jeff Hammel add a file to merge hg repositories