Mercurial > hg
view tests/test-merge4.out @ 712:b4f0fad0ea64
Merge with myself.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with myself.
manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh
ka6ciaH1pQLhOyKgqdbqwOA=
=pOV4
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 15 Jul 2005 13:42:19 +0100 |
parents | 5e9e8b8d2629 |
children | 7e4843b7efd2 |
line wrap: on
line source
+ hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + hg update 0 + echo This is file c1 + hg add c + hg commit -t 'commit #2' -d '0 0' -u user + hg update -m 1 + rm b + echo This is file c22 + hg commit -t 'commit #3' -d '0 0' -u user