http://hg.python.org/cpython/rev/df7289fbe4ac changeset: 71288:df7289fbe4ac parent: 71286:19b3b2d93a63 parent: 71287:fc8b5c6a021c user: Antoine Pitrou <solipsis at pitrou.net> date: Sat Jul 09 16:02:58 2011 +0200 summary: Dummy merge files: -- Repository URL: http://hg.python.org/cpython