| changeset 5224 | 9cd6578750b9 |
| parent 5065 | 12930b97a729 |
| 5220:2b8373bda032 | 5224:9cd6578750b9 |
|---|---|
52 cat foo2 |
52 cat foo2 |
53 |
53 |
54 hg ci -m'merged' -d '3 0' |
54 hg ci -m'merged' -d '3 0' |
55 hg tip -v |
55 hg tip -v |
56 |
56 |
57 echo % nothing to merge -- tip |
|
58 hg imerge |
|
59 |
|
60 hg up 0 |
|
57 echo % nothing to merge |
61 echo % nothing to merge |
58 hg imerge |
62 hg imerge |
59 |
63 |
60 exit 0 |
64 exit 0 |