Mercurial > hg > mercurial-crew-with-dirclash

annotate .hgignore @ 174:23057dc57d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg merge: abort if there are outstanding changes in the working directory We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.
author mpm@selenic.com
date Thu, 26 May 2005 22:54:48 -0800
parents 4a6ab4d80dc4
children ca39b80cbe15
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
51
0cbcdb855156 Ignore .orig and .rej files from patch
mpm@selenic.com
parents: 8
diff changeset
1 .*\.orig
0cbcdb855156 Ignore .orig and .rej files from patch
mpm@selenic.com
parents: 8
diff changeset
2 .*\.rej
1
273ce12ad8f1 Update README to discuss remote pull, rsync, and the hg repo
mpm@selenic.com
parents:
diff changeset
3 .*~
72
4a6ab4d80dc4 Add an O(m + nlog n) patching extension
mpm@selenic.com
parents: 51
diff changeset
4 .*\.so
3
3a6392190075 Ignore build/ and .pyc files
mpm@selenic.com
parents: 1
diff changeset
5 .*pyc
3a6392190075 Ignore build/ and .pyc files
mpm@selenic.com
parents: 1
diff changeset
6 build/.*
8
e5a480dadca3 Ignore MANIFEST
mpm@selenic.com
parents: 6
diff changeset
7 dist/
e5a480dadca3 Ignore MANIFEST
mpm@selenic.com
parents: 6
diff changeset
8 MANIFEST$