.hgignore
author mpm@selenic.com
Fri, 03 Jun 2005 18:27:55 -0800
changeset 240 737c66b68290
parent 72 4a6ab4d80dc4
child 352 ca39b80cbe15
permissions -rw-r--r--
Replace tkmerge with hgmerge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace tkmerge with hgmerge hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch. hg will use hgmerge unless overridden with HGMERGE manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP vYI6qlyWKQZ01ObUTAIg92o= =+mRH -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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$