tests/test-merge10.t
changeset 16913 f2719b387380
parent 12156 4c94b6d0fb1c
child 34661 eb586ed5d8ce
equal deleted inserted replaced
16912:6ef3107c661e 16913:f2719b387380
    47   --- a/testdir/subdir/a
    47   --- a/testdir/subdir/a
    48   +++ b/testdir/subdir/a
    48   +++ b/testdir/subdir/a
    49   @@ -1,1 +1,1 @@
    49   @@ -1,1 +1,1 @@
    50   -a
    50   -a
    51   +alpha
    51   +alpha
       
    52 
       
    53   $ cd ..