tests/test-merge2.out
changeset 925 5a034646e472
parent 814 0902ffece4b4
child 2175 b2ae81a7df29
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
     1 + hg init
       
     2 + hg add a
       
     3 + hg commit -m commit #0 -d 0 0
       
     4 + hg add b
       
     5 + hg commit -m commit #1 -d 0 0
       
     6 + hg update 0
       
     7 + hg add b
       
     8 + hg commit -m commit #2 -d 0 0
       
     9 + hg init
       
    10 + hg add a
       
    11 + hg commit -m commit #0 -d 0 0
       
    12 + hg add b
       
    13 + hg commit -m commit #1 -d 0 0
       
    14 + hg update 0
       
    15 + hg commit -A -m commit #2 -d 0 0
       
    16 adding b
     1 adding b
    17 + hg init
       
    18 + hg add a
       
    19 + hg commit -m commit #0 -d 0 0
       
    20 + hg add b
       
    21 + hg commit -m commit #1 -d 0 0
       
    22 + hg remove b
       
    23 + hg update 0
       
    24 + hg commit -A -m commit #2 -d 0 0
       
    25 adding b
     2 adding b