215   o  0:07f494440405@default(public) bk:[] adda

   215   o  0:07f494440405@default(public) bk:[] adda

   216   

   216   

   217   $ echo 'babar' >> a

   217   $ echo 'babar' >> a

   218   $ hg amend

   218   $ hg amend

   219   $ hg up --hidden 3932c176bbaa

   219   $ hg up --hidden 3932c176bbaa

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

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

   221   working directory parent is obsolete! (3932c176bbaa)

   222   working directory parent is obsolete! (3932c176bbaa)

   222   (use 'hg evolve' to update to its successor: d2f173e25686)

   223   (use 'hg evolve' to update to its successor: d2f173e25686)

   223   $ mv a a.old

   224   $ mv a a.old

   224   $ echo 'jungle' > a

   225   $ echo 'jungle' > a

   323 

   324 

   324 Check conflict during divergence resolution

   325 Check conflict during divergence resolution

   325 -------------------------------------------------

   326 -------------------------------------------------

   326 

   327 

   327   $ hg up --hidden 3932c176bbaa

   328   $ hg up --hidden 3932c176bbaa

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

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

   329   working directory parent is obsolete! (3932c176bbaa)

   331   working directory parent is obsolete! (3932c176bbaa)

   330   (use 'hg evolve' to update to its successor: f344982e63c4)

   332   (use 'hg evolve' to update to its successor: f344982e63c4)

   331   $ echo 'gotta break' >> a

   333   $ echo 'gotta break' >> a

   332   $ hg amend

   334   $ hg amend