335 

   335 

   336   $ hg merge

   336   $ hg merge

   337   merging a

   337   merging a

   338   warning: cannot merge flags for b

   338   warning: cannot merge flags for b

   339   merging b

   339   merging b

   341   merging bx

   340   merging bx

   342   warning: cannot merge flags for c

   341   warning: cannot merge flags for c

   343   merging d

   342   merging d

   344   warning: internal :merge cannot merge symlinks for d

   343   warning: internal :merge cannot merge symlinks for d

   345   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')

   344   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')

   398   $ hg up -Cqr1

   397   $ hg up -Cqr1

   399   $ hg merge

   398   $ hg merge

   400   merging a

   399   merging a

   401   warning: cannot merge flags for b

   400   warning: cannot merge flags for b

   402   merging b

   401   merging b

   404   merging bx

   402   merging bx

   405   warning: cannot merge flags for c

   403   warning: cannot merge flags for c

   406   merging d

   404   merging d

   407   warning: internal :merge cannot merge symlinks for d

   405   warning: internal :merge cannot merge symlinks for d

   408   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')

   406   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')