log python/hg-merge.py @ 584:ed99a36df540

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