log python/hg-merge.py @ 498:95ba5770d2f0

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