Mercurial > hg > mercurial-crew-with-dirclash
view tests/simple-merge @ 239:75840796e8e2
mdiff.py: kill #! line, add copyright notice
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mdiff.py: kill #! line, add copyright notice
manifest hash: acb4e14d5947d0fde5b89a874af0476773ee1cee
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoM9CywK+sNU5EO8RAizVAJ41dqQxxx8nouBxJMcFmoVRRo4GfACbB9RV
Xc0cqaoPVL7p87opPKjgNWw=
=HyjH
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 13:44:34 -0800 |
parents | 9f64ee817199 |
children |
line wrap: on
line source
set -ex export EDITOR=true rm -rf test branch mkdir test cd test echo foo>foo hg init hg addremove hg commit hg verify cd .. cp -a test branch cd branch echo bar>>foo hg commit cd ../test hg merge ../branch hg verify