| changeset 21266 | 19d6fec60b81 |
| parent 19470 | 19ac0d8ee9a2 |
| child 21267 | e4f451c8c05c |
| 21265:232de244ab6f | 21266:19d6fec60b81 |
|---|---|
152 $ fileset 'resolved()' |
152 $ fileset 'resolved()' |
153 $ fileset 'unresolved()' |
153 $ fileset 'unresolved()' |
154 b2 |
154 b2 |
155 $ echo e > b2 |
155 $ echo e > b2 |
156 $ hg resolve -m b2 |
156 $ hg resolve -m b2 |
157 no unresolved files; you may continue your unfinished operation |
|
157 $ fileset 'resolved()' |
158 $ fileset 'resolved()' |
158 b2 |
159 b2 |
159 $ fileset 'unresolved()' |
160 $ fileset 'unresolved()' |
160 $ hg ci -m merge |
161 $ hg ci -m merge |
161 |
162 |