tree fc188b074bf94505e1cd2e81b4becc8072a54780
parent 6f0cf7ee207da5f81078e45a547ee5ba91df4039
author Guido van Rossum <guido@python.org> 871596266 +0000
committer Guido van Rossum <guido@python.org> 871596266 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%408523

Added logmerge.py