log python/hg-merge.py @ 600:a77f7022cc06

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