Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge4.out @ 850:d2bf8b9534b1
Add temporary documentation files and profiling output to .hgignore
author | Samuel Tardieu <sam@rfc1149.net> |
---|---|
date | Sat, 06 Aug 2005 21:18:21 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
rev | line source |
---|---|
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
1 + hg init |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
2 + hg add a |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 + hg commit -m commit #0 -d 0 0 |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
4 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
5 + hg commit -m commit #1 -d 0 0 |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
6 + hg update 0 |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
7 + hg add c |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
8 + hg commit -m commit #2 -d 0 0 |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
9 + hg update -m 1 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
10 + hg commit -m commit #3 -d 0 0 |