log python/hg-merge.py @ 530:772c61f04ccf

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