log python/hg-merge.py @ 673:1b8ea91f00a0

age author description
Mon, 13 Feb 2012 16:22:59 -0800 Jeff Hammel add a file to merge hg repositories