equal
deleted
inserted
replaced
143 | | | (*splitting* is | |
143 | | | (*splitting* is | |
144 | | | properly not detected as a | |
144 | | | properly not detected as a | |
145 | | | conflict) | |
145 | | | conflict) | |
146 | | | | |
146 | | | | |
147 | | | (possible alternative names:| |
147 | | | (possible alternative names:| |
148 | | | clashing, rival, concurent, | |
148 | | | clashing, rival, concurrent,| |
149 | | | conflicting) | |
149 | | | conflicting) | |
150 | | | | |
150 | | | | |
151 | +--------------------------+-----------------------------+ |
151 | +--------------------------+-----------------------------+ |
152 | | | |
152 | | | |
153 | | Mutable changesets which are neither *obsolete* or | |
153 | | Mutable changesets which are neither *obsolete* or | |
229 (*unstable*, *bumped* and *divergent*) |
229 (*unstable*, *bumped* and *divergent*) |
230 |
230 |
231 This is an important name as hg pull/push will suggest it the same way it |
231 This is an important name as hg pull/push will suggest it the same way it |
232 suggest merging when you add heads. |
232 suggest merging when you add heads. |
233 |
233 |
234 alternative names: |
234 Alternative names: |
235 |
235 |
236 - solve (too generic ?) |
236 - solve (too generic ?) |
237 - stabilize |
237 - stabilize |