view tests/test-merge4.out @ 600:11c379e23ad6

Simplify RSS date generation -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Simplify RSS date generation manifest hash: 3b1628aaee450c292949f6d079b4a05ccb5ce6ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyLatywK+sNU5EO8RAiLMAKCqYFyzSDCU6Wm34LSWZroAHMqa4QCfSWv6 jh/vvuQS0qmXybm6Ivd7XVY= =x1Rf -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sun, 03 Jul 2005 20:10:21 -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