log python/hg-merge.py @ 358:0e270a448610

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