mercurial-crew-with-dirclash: .hgignore@61d45b0ba8fb (annotated)

various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----

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$

author	mpm@selenic.com
	Tue, 07 Jun 2005 20:06:05 -0800
changeset 275	61d45b0ba8fb
parent 72	4a6ab4d80dc4
child 352	ca39b80cbe15
permissions	-rw-r--r--