author | mason@suse.com |
Sun, 14 Aug 2005 20:08:35 -0800 | |
changeset 900 | ba8cf1f2210c |
parent 814 | 0902ffece4b4 |
child 925 | 5a034646e472 |
permissions | -rw-r--r-- |
346 | 1 |
+ hg init |
2 |
+ hg add a |
|
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 |
+ hg commit -m ancestor -d 0 0 |
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
4 |
+ hg commit -m branch1 -d 0 0 |
346 | 5 |
+ hg co 0 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
6 |
+ hg commit -m branch2 -d 0 0 |
591 | 7 |
+ hg up -m 1 |
346 | 8 |
merge: warning: conflicts during merge |
9 |
merging a |
|
10 |
merging a failed! |
|
11 |
+ hg id |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
12 |
32e80765d7fe+75234512624c+ tip |
346 | 13 |
something else |
14 |
======= |
|
15 |
something |
|
16 |
+ hg status |
|
748 | 17 |
M a |