.hgignore
author Christian Ebert <blacktrash@gmx.net>
Fri, 22 Aug 2008 11:53:30 +0200
branch0.9.2compat
changeset 486 a6f4e1367978
parent 424 6a310d6b40c4
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:
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     1
syntax: glob
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     2
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     3
*.pyc
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
     4
*.pyo
0
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     5
*~
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     6
*.swp
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     7
*.orig
41c7e55cd9e9 Startup hgkeyword package with .hgignore, __init__.py
Christian Ebert <blacktrash@gmx.net>
parents:
diff changeset
     8
*.rej
424
6a310d6b40c4 (0.9.2compat) ignore .DS_Store
Christian Ebert <blacktrash@gmx.net>
parents: 238
diff changeset
     9
.DS_Store
124
99dc49c5bcfb Setup standalone module install, version tracking
Christian Ebert <blacktrash@gmx.net>
parents: 0
diff changeset
    10
212
0ac36a08c320 hgignore build directory
Christian Ebert <blacktrash@gmx.net>
parents: 124
diff changeset
    11
build/*
220
943e1e1ea042 Include MANIFEST.in in dist; hgignore MANIFEST
Christian Ebert <blacktrash@gmx.net>
parents: 212
diff changeset
    12
MANIFEST