tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Sun, 10 Jul 2005 14:06:30 -0800
changeset 659 3662e3d6b690
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rw-r--r--
Whitespace cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanup manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp tWbRrjDz/SbKz/tFAsxJDqo= =xB66 -----END PGP SIGNATURE-----

+ 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!