Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 762:312b4a10d862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed more occurances of 'text' to 'message'.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 22 Jul 2005 16:26:46 +0100
parents 7e4843b7efd2
children 61ed30e82b27
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
1 + hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
2 + echo This is file a1
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
3 + hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 402
diff changeset
4 + hg commit -m 'commit #0' -d '0 0'
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
5 + touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
6 + hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
7 + rm b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 402
diff changeset
8 + hg commit -A '-mcomment #1' -d '0 0'
402
2fe8d66e3075 [PATCH] (3/4) Removing an added file
mpm@selenic.com
parents:
diff changeset
9 b never committed!