514 

   514 

   515   $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent

   515   $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent

   516   merge:[5] fix bug 24 (v2 by bob)

   516   merge:[5] fix bug 24 (v2 by bob)

   517   with: [6] fix bug 24 (v2 by alice)

   517   with: [6] fix bug 24 (v2 by alice)

   518   base: [4] fix bug 24 (v1)

   518   base: [4] fix bug 24 (v1)

   520   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   519   0 files updated, 1 files merged, 0 files removed, 0 files unresolved

   521   working directory is now at b1499b0f03ca

   520   working directory is now at b1499b0f03ca

   522   $ hg log -q -r 'contentdivergent()'

   521   $ hg log -q -r 'contentdivergent()'

   523 

   522 

   524 Figure SG10: Bob's repository after fixing divergence.

   523 Figure SG10: Bob's repository after fixing divergence.