| changeset 25111 | 1ef96a3b8b89 |
| parent 23917 | 3cbb5bf4035d |
| child 25382 | 6084926366b9 |
| 25110:c9f382c8233a | 25111:1ef96a3b8b89 |
|---|---|
474 parent: 2:e4e3f3546619 tip |
474 parent: 2:e4e3f3546619 tip |
475 c2b |
475 c2b |
476 branch: default |
476 branch: default |
477 commit: 1 modified, 1 unresolved (merge) |
477 commit: 1 modified, 1 unresolved (merge) |
478 update: (current) |
478 update: (current) |
479 phases: 3 draft (draft) |
|
479 rebase: 0 rebased, 1 remaining (rebase --continue) |
480 rebase: 0 rebased, 1 remaining (rebase --continue) |
480 |
481 |
481 $ hg resolve -l |
482 $ hg resolve -l |
482 U c2 |
483 U c2 |
483 |
484 |