| changeset 5224 | 9cd6578750b9 |
| parent 5065 | 12930b97a729 |
| 5220:2b8373bda032 | 5224:9cd6578750b9 |
|---|---|
39 files: foo foo2 |
39 files: foo foo2 |
40 description: |
40 description: |
41 merged |
41 merged |
42 |
42 |
43 |
43 |
44 % nothing to merge -- tip |
|
45 abort: there is nothing to merge |
|
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
44 % nothing to merge |
47 % nothing to merge |
45 abort: there is nothing to merge - use "hg update" instead |
48 abort: there is nothing to merge - use "hg update" instead |