MANIFEST.in
author Christian Ebert <blacktrash@gmx.net>
Fri, 22 Aug 2008 11:53:30 +0200
branch0.9.2compat
changeset 486 a6f4e1367978
parent 238 e4a389eca1b9
permissions -rw-r--r--
(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
191
4c3775e904b6 Add MANIFEST.in
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
# $Id$
4c3775e904b6 Add MANIFEST.in
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     2
4c3775e904b6 Add MANIFEST.in
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     3
include tests/test-keyword tests/test-keyword.out
220
943e1e1ea042 Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net>
parents: 191
diff changeset
     4
943e1e1ea042 Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net>
parents: 191
diff changeset
     5
include MANIFEST.in