equal
deleted
inserted
replaced
330 $ hg resolve -ma |
330 $ hg resolve -ma |
331 abort: unsupported merge state records: X |
331 abort: unsupported merge state records: X |
332 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) |
332 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information) |
333 [255] |
333 [255] |
334 $ hg summary |
334 $ hg summary |
|
335 warning: merge state has unsupported record types: X |
335 parent: 2:57653b9f834a |
336 parent: 2:57653b9f834a |
336 append baz to files |
337 append baz to files |
337 parent: 1:dc77451844e3 |
338 parent: 1:dc77451844e3 |
338 append bar to files |
339 append bar to files |
339 branch: default |
340 branch: default |
340 warning: merge state has unsupported record types: X |
|
341 commit: 2 modified, 2 unknown (merge) |
341 commit: 2 modified, 2 unknown (merge) |
342 update: 2 new changesets (update) |
342 update: 2 new changesets (update) |
343 phases: 5 draft |
343 phases: 5 draft |
344 |
344 |
345 update --clean shouldn't abort on unsupported records |
345 update --clean shouldn't abort on unsupported records |