From: Guido van Rossum <guido@python.org>
Date: Thu, 14 Aug 1997 22:04:26 +0000 (+0000)
Subject: Added logmerge.py
X-Git-Tag: v1.5a3~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3485bb6f44a5c07fb1387f3c3b9b02067252b990;p=thirdparty%2FPython%2Fcpython.git

Added logmerge.py
---

diff --git a/Tools/scripts/README b/Tools/scripts/README
index 7159767d8d5f..6013a48db647 100644
--- a/Tools/scripts/README
+++ b/Tools/scripts/README
@@ -20,6 +20,7 @@ h2py.py			Translate #define's into Python assignments
 ifdef.py		Remove #if(n)def groups from C sources
 linktree.py		Make a copy of a tree with links to original files
 lll.py			Find and list symbolic links in current directory
+logmerge.py		Consolidate CVS/RCS logs read from stdin
 methfix.py		Fix old method syntax def f(self, (a1, ..., aN)):
 mkreal.py		Turn a symbolic link into a real file or directory
 objgraph.py		Print object graph from nm output on a library