272    source   t

   272    source   t

   273    revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382

   273    revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382

   274   $ hg ci -m9

   274   $ hg ci -m9

   275   created new head

   275   created new head

   276   $ hg merge 6 --debug # test change

   276   $ hg merge 6 --debug # test change

   278   resolving manifests

   277   resolving manifests

   279    branchmerge: True, force: False, partial: False

   278    branchmerge: True, force: False, partial: False

   280    ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4

   279    ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4

   281   starting 4 threads for background file closing (?)

   280   starting 4 threads for background file closing (?)

   282    .hgsubstate: versions differ -> m (premerge)

   281    .hgsubstate: versions differ -> m (premerge)

   299    revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

   298    revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

   300   $ echo conflict > t/t

   299   $ echo conflict > t/t

   301   $ hg ci -m10

   300   $ hg ci -m10

   302   committing subrepository t

   301   committing subrepository t

   303   $ HGMERGE=internal:merge hg merge --debug 7 # test conflict

   302   $ HGMERGE=internal:merge hg merge --debug 7 # test conflict

   305   resolving manifests

   303   resolving manifests

   306    branchmerge: True, force: False, partial: False

   304    branchmerge: True, force: False, partial: False

   307    ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf

   305    ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf

   308   starting 4 threads for background file closing (?)

   306   starting 4 threads for background file closing (?)

   309    .hgsubstate: versions differ -> m (premerge)

   307    .hgsubstate: versions differ -> m (premerge)

   311     subrepo t: both sides changed 

   309     subrepo t: both sides changed 

   312    subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)

   310    subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)

   313   starting 4 threads for background file closing (?)

   311   starting 4 threads for background file closing (?)

   314   (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m

   312   (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m

   315   merging subrepository "t"

   313   merging subrepository "t"

   317   resolving manifests

   314   resolving manifests

   318    branchmerge: True, force: False, partial: False

   315    branchmerge: True, force: False, partial: False

   319    ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198

   316    ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198

   320    preserving t for resolve of t

   317    preserving t for resolve of t

   321   starting 4 threads for background file closing (?)

   318   starting 4 threads for background file closing (?)