363   test L:um a b R:um a b W:       - 9  do merge with ancestor in a

   363   test L:um a b R:um a b W:       - 9  do merge with ancestor in a

   364   --------------

   364   --------------

   365     searching for copies back to rev 1

   365     searching for copies back to rev 1

   366     unmatched files new in both:

   366     unmatched files new in both:

   367      b

   367      b

   368   resolving manifests

   371   resolving manifests

   369    branchmerge: True, force: False, partial: False

   372    branchmerge: True, force: False, partial: False

   370    ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493

   373    ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493

   371    preserving b for resolve of b

   374    preserving b for resolve of b

   372    preserving rev for resolve of rev

   375    preserving rev for resolve of rev

   950      7/f

   953      7/f

   951     unmatched files new in both:

   954     unmatched files new in both:

   952      0/f

   955      0/f

   953      1/g

   956      1/g

   954     all copies found (* = to merge, ! = divergent, % = renamed and deleted):

   957     all copies found (* = to merge, ! = divergent, % = renamed and deleted):

   955      src: '3/f' -> dst: '3/g' *

   959      src: '3/f' -> dst: '3/g' *

   956      src: '4/f' -> dst: '4/g' *

   960      src: '4/f' -> dst: '4/g' *

   957      src: '5/f' -> dst: '5/g' *

   961      src: '5/f' -> dst: '5/g' *

   958      src: '6/f' -> dst: '6/g' *

   962      src: '6/f' -> dst: '6/g' *

   959     checking for directory renames

   963     checking for directory renames