Mercurial > hg > mercurial-crew-with-dirclash
view tests/simple-merge @ 266:4af7677de4a9
Fix argument processing for patch and rawcommit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix argument processing for patch and rawcommit
manifest hash: fc76fcd22ca69185bbec1855f72dda5b692e03f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVNMywK+sNU5EO8RAn2nAJ4gBbdn8K6xN55Igh6J2ZJEMgRGBACgr0Xb
KkjbnOrNL5uQmBHx59C7HdY=
=qsQi
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Mon, 06 Jun 2005 23:57:00 -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