log python/hg-merge.py @ 245:aa31dc7ccb66

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