129   $ echo target > b/c

   129   $ echo target > b/c

   130   $ hg add b/c

   130   $ hg add b/c

   131   $ hg commit -qm 'new file in target directory'

   131   $ hg commit -qm 'new file in target directory'

   132   $ hg merge 2

   132   $ hg merge 2

   133   merging b/c and a/c to b/c

   133   merging b/c and a/c to b/c

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

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

   137   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   136   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   138   [1]

   137   [1]

   139   $ hg st -A

   138   $ hg st -A

   140   M b/c

   139   M b/c

   160   C a/a

   159   C a/a

   161   C a/b

   160   C a/b

   162   C a/c

   161   C a/c

   163   $ hg merge 5

   162   $ hg merge 5

   164   merging a/c and b/c to b/c

   163   merging a/c and b/c to b/c

   167   2 files updated, 0 files merged, 2 files removed, 1 files unresolved

   165   2 files updated, 0 files merged, 2 files removed, 1 files unresolved

   168   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   166   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

   169   [1]

   167   [1]

   170   $ hg st -A

   168   $ hg st -A

   171   M b/a

   169   M b/a