tests/test-merge2.t
changeset 13956 ffb5c09ba822
parent 12156 4c94b6d0fb1c
child 16913 f2719b387380
equal deleted inserted replaced
13954:1184bb274cb3 13956:ffb5c09ba822
     1   $ mkdir t
     1   $ hg init t
     2   $ cd t
     2   $ cd t
     3   $ hg init
       
     4   $ echo This is file a1 > a
     3   $ echo This is file a1 > a
     5   $ hg add a
     4   $ hg add a
     6   $ hg commit -m "commit #0"
     5   $ hg commit -m "commit #0"
     7   $ echo This is file b1 > b
     6   $ echo This is file b1 > b
     8   $ hg add b
     7   $ hg add b
    32   $ hg commit -A -m "commit #2"
    31   $ hg commit -A -m "commit #2"
    33   adding b
    32   adding b
    34   created new head
    33   created new head
    35   $ cd ..; rm -r t
    34   $ cd ..; rm -r t
    36 
    35 
    37   $ mkdir t
    36   $ hg init t
    38   $ cd t
    37   $ cd t
    39   $ hg init
       
    40   $ echo This is file a1 > a
    38   $ echo This is file a1 > a
    41   $ hg add a
    39   $ hg add a
    42   $ hg commit -m "commit #0"
    40   $ hg commit -m "commit #0"
    43   $ echo This is file b1 > b
    41   $ echo This is file b1 > b
    44   $ hg add b
    42   $ hg add b