log python/hg-merge.py @ 346:7eaaf99e3182

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