581 

   582 Check conflict detection

   583 

   584   $ hg up 9468a5f5d8b2 #  add obsol_d''

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

   586   $ mkcommit "obsolet_conflicting_d"

   587   $ hg summary

   588   parent: 14:50f11e5e3a63 tip

   589    add obsolet_conflicting_d

   590   branch: default

   591   commit: (clean)

   592   update: 9 new changesets, 9 branch heads (merge)

   593   $ hg debugobsolete 50f11e5e3a63 a7a6f2b5d8a5

   594   $ hg log -r 'conflicting()'

   595   changeset:   14:50f11e5e3a63

   596   tag:         tip

   597   parent:      11:9468a5f5d8b2

   598   user:        test

   599   date:        Thu Jan 01 00:00:00 1970 +0000

   600   summary:     add obsolet_conflicting_d

   601