Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-flags @ 414:291a62848f54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ls output for test-flags -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix ls output for test-flags manifest hash: 491b49f66da7c19cbfe9635dc03e4ba510052ed3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNc4ywK+sNU5EO8RAilRAJ4gOaWbFqXOkat4jCZfierb8aTZvACgr8NP TrvpZ3vWf0aY0bYkkGQDSDw= =HVCS -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:12:56 -0800
parents 40cfa2d0c088
children 22b5aaeb3637
comparison
equal deleted inserted replaced
413:a3b5347c22cd 414:291a62848f54
20 20
21 cd ../test1 21 cd ../test1
22 echo 123 >>a 22 echo 123 >>a
23 hg ci -t "a updated" -u test -d "0 0" 23 hg ci -t "a updated" -u test -d "0 0"
24 24
25 ls -l ../test[12]/a
26
27 hg merge ../test2 25 hg merge ../test2
28 hg heads 26 hg heads
29 hg history 27 hg history
30 28
31 hg -dv co -m 29 hg -dv co -m