view tests/test-merge3.out @ 520:12b4b5612fe4

Add some TODO items -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add some TODO items manifest hash: d188abf3c84b6ca98279b4bf053ce2844da83a03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwvKyywK+sNU5EO8RAh9ZAJ9kYA0a/R7XynWqZGGr6JqUvXa37wCfd2a2 F9fCY85bSZgErvdrklP29bQ= =FtlU -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 11:12:50 -0800
parents 2fe8d66e3075
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
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-tcomment #1' -d '0 0' -u user
b never committed!