log python/hg-merge.py @ 385:6ef0ea2f10e3

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