285 internal:mergediff

   286 

   287   $ hg co -C 1

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

   289   $ cat << EOF > a

   290   > Small Mathematical Series.

   291   > 1

   292   > 2

   293   > 3

   294   > 4

   295   > 4.5

   296   > 5

   297   > Hop we are done.

   298   > EOF

   299   $ hg co -m 2 -t internal:mergediff

   300   merging a

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

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

   303   use 'hg resolve' to retry unresolved file merges

   304   [1]

   305   $ cat a

   306   Small Mathematical Series.

   307   1

   308   2

   309   3

   310   <<<<<<<

   311   ------- base

   312   +++++++ working copy

   313    4

   314   +4.5

   315    5

   316   ======= destination

   317   6

   318   8

   319   >>>>>>>

   320   Hop we are done.

   321 Test the same thing as above but modify a bit more so we instead get the working

   322 copy in full and the diff from base to destination.

   323   $ hg co -C 1

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

   325   $ cat << EOF > a

   326   > Small Mathematical Series.

   327   > 1

   328   > 2

   329   > 3.5

   330   > 4.5

   331   > 5.5

   332   > Hop we are done.

   333   > EOF

   334   $ hg co -m 2 -t internal:mergediff

   335   merging a

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

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

   338   use 'hg resolve' to retry unresolved file merges

   339   [1]

   340   $ cat a

   341   Small Mathematical Series.

   342   1

   343   2

   344   <<<<<<<

   345   ======= working copy

   346   3.5

   347   4.5

   348   5.5

   349   ------- base

   350   +++++++ destination

   351    3

   352   -4

   353   -5

   354   +6

   355   +8

   356   >>>>>>>

   357   Hop we are done.

   358