Mercurial > hgbook
comparison en/examples/branch-named @ 398:2936cb7eae7a
Fix sample output for test 'branch-named'.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 21:55:35 +0200 |
| parents | 6519f3b983b4 |
| children |
comparison
equal
deleted
inserted
replaced
| 397:2b8c6aa370d5 | 398:2936cb7eae7a |
|---|---|
| 62 hg heads | 62 hg heads |
| 63 | 63 |
| 64 #$ name: update-bar | 64 #$ name: update-bar |
| 65 | 65 |
| 66 hg update bar | 66 hg update bar |
| 67 hg update -C bar | |
| 68 | 67 |
| 69 #$ name: merge | 68 #$ name: merge |
| 70 | 69 |
| 71 hg branch | 70 hg branch |
| 72 hg merge | 71 hg merge foo |
| 73 hg commit -m 'Merge' | 72 hg commit -m 'Merge' |
| 74 hg tip | 73 hg tip |