| changeset 4410 | bbc97d419b16 |
| parent 4232 | 0d51eb296fb9 |
| 4409:28b7d949ef6a | 4410:bbc97d419b16 |
|---|---|
49 hg up -q |
49 hg up -q |
50 hg id |
50 hg id |
51 hg branch foobar |
51 hg branch foobar |
52 hg up |
52 hg up |
53 |
53 |
54 echo % fastforward merge |
|
55 hg branch ff |
|
56 echo ff > ff |
|
57 hg ci -Am'fast forward' -d '1000000 0' |
|
58 hg up foo |
|
59 hg merge ff |
|
60 hg branch |
|
61 hg commit -m'Merge ff into foo' -d '1000000 0' |
|
62 hg parents |
|
63 hg manifest |
|
64 |
|
54 exit 0 |
65 exit 0 |