tests/test-conflict.t
changeset 48590 7e503eff3c76
parent 48589 a51c522c0064
child 49621 55c6ebd11cb9
equal deleted inserted replaced
48589:a51c522c0064 48590:7e503eff3c76
   306   Small Mathematical Series.
   306   Small Mathematical Series.
   307   1
   307   1
   308   2
   308   2
   309   3
   309   3
   310   <<<<<<<
   310   <<<<<<<
   311   ------- base
   311   ------- working copy parent
   312   +++++++ working copy
   312   +++++++ working copy
   313    4
   313    4
   314   +4.5
   314   +4.5
   315    5
   315    5
   316   ======= destination
   316   ======= destination
   344   <<<<<<<
   344   <<<<<<<
   345   ======= working copy
   345   ======= working copy
   346   3.5
   346   3.5
   347   4.5
   347   4.5
   348   5.5
   348   5.5
   349   ------- base
   349   ------- working copy parent
   350   +++++++ destination
   350   +++++++ destination
   351    3
   351    3
   352   -4
   352   -4
   353   -5
   353   -5
   354   +6
   354   +6