equal
deleted
inserted
replaced
135 ================================= |
135 ================================= |
136 |
136 |
137 Here is a list of know issue that will be fixed later: |
137 Here is a list of know issue that will be fixed later: |
138 |
138 |
139 |
139 |
140 * ``hg stabilize`` does not handle merge conflict. |
140 * rewriting conflict are not detected yet``hg evolve`` does not |
141 |
|
142 You must fallback to graft or rebase when that happen. |
|
143 |
|
144 * rewriting conflict are not detected yet``hg stabilize`` does not |
|
145 handle them. |
141 handle them. |
146 |
142 |
147 * ``hg update`` can move an obsolete parent |
143 * ``hg update`` can move an obsolete parent |
148 |
144 |
149 * you need to provide to `graft --continue -O` if you started you |
145 * you need to provide to `graft --continue -O` if you started you |