log python/hg-merge.py @ 566:e3341b7ce4ef

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