tests/test-double-merge.t
changeset 16913 f2719b387380
parent 16795 e9ae770eff1c
child 18135 a6fe1b9cc68f
equal deleted inserted replaced
16912:6ef3107c661e 16913:f2719b387380
    61 contents of bar
    61 contents of bar
    62   $ cat bar
    62   $ cat bar
    63   line 0
    63   line 0
    64   line 1
    64   line 1
    65   line 2-2
    65   line 2-2
       
    66 
       
    67   $ cd ..