tests/test-merge-revert.out
author Lee Cantey <lcantey@gmail.com>
Fri, 24 Mar 2006 08:27:24 +0100
changeset 1992 ea8345a7a29d
parent 1933 7544700fd931
child 2029 d436b21b20dc
permissions -rw-r--r--
Include templates/static/* in MANIFEST.in so that distutils setup will include them.

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
eb43f19ff115
016807e6fdaf tip
merging file1
016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip
016807e6fdaf tip