annotate .hgignore @ 226:1536ccac47e9

merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:45:04 -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$