equal
deleted
inserted
replaced
339 $ echo 'gotta break' >> a |
339 $ echo 'gotta break' >> a |
340 $ hg amend |
340 $ hg amend |
341 2 new divergent changesets |
341 2 new divergent changesets |
342 # reamend so that the case is not the first precursor. |
342 # reamend so that the case is not the first precursor. |
343 $ hg amend -m "More addition (2)" |
343 $ hg amend -m "More addition (2)" |
344 $ hg phase 'divergent()' |
344 $ hg phase 'contentdivergent()' |
345 21: draft |
345 21: draft |
346 24: draft |
346 24: draft |
347 $ hg evolve -qn --contentdivergent |
347 $ hg evolve -qn --contentdivergent |
348 hg update -c 0b336205a5d0 && |
348 hg update -c 0b336205a5d0 && |
349 hg merge f344982e63c4 && |
349 hg merge f344982e63c4 && |