view tests/test-merge3.out @ 470:0ab093b473c5

Fix up version module name and command conflict -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up version module name and command conflict This unties the command name from the function name manifest hash: 926d097f75cbb5eb2464bb253e9a89050c6208bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvRLnywK+sNU5EO8RAvryAJ9RU0PLFOXjjtQjs8UVyOC9wde69gCgrV+G 8jYfMyWwvwsmOM7wMblPGqM= =Acyk -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 25 Jun 2005 00:16:39 -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!