tests/test-conflict.out
changeset 748 c5df1a9c5276
parent 591 eb46971fc57f
child 749 7e4843b7efd2
equal deleted inserted replaced
747:c3ce3976ae75 748:c5df1a9c5276
    18 + grep -Ev '>>>|<<<' a
    18 + grep -Ev '>>>|<<<' a
    19 something else
    19 something else
    20 =======
    20 =======
    21 something
    21 something
    22 + hg status
    22 + hg status
    23 C a
    23 M a
    24 ? .out
    24 ? .out