tests/test-merge-default.t
branchstable
changeset 49621 55c6ebd11cb9
parent 45827 8d72e29ad1e0
equal deleted inserted replaced
49620:8cd39c20445e 49621:55c6ebd11cb9
     1   $ hg init
     1   $ hg init repo
       
     2   $ cd repo
     2   $ echo a > a
     3   $ echo a > a
     3   $ hg commit -A -ma
     4   $ hg commit -A -ma
     4   adding a
     5   adding a
     5 
     6 
     6   $ echo b >> a
     7   $ echo b >> a