log python/hg-merge.py @ 544:ed193fcaa0dc

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