log python/hg-merge.py @ 277:1096fddc22a3

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