view tests/test-merge4.out @ 517:9b884be92af2

Add --repository option -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add --repository option From: Goffredo Baroncelli <kreijack@libero.it> manifest hash: 714316cb69ed5fcd981aa1bdb12de499e8348997 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuyRywK+sNU5EO8RAmh7AKCtUxqC0KFcMYmoh/voLAbh6BncpwCgrL42 zzSMZAiUg4KEO9BxxlJOcDs= =eUcM -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 10:46:41 -0800
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