1 1:f248da0d4c3e

     1 1:f248da0d4c3e

     2 0:9eca13a34789

     2 0:9eca13a34789

     3 f248da0d4c3e tip

     3 f248da0d4c3e tip

     4 9eca13a34789

     4 9eca13a34789

     5 9eca13a34789+

     5 9eca13a34789+

     6 9eca13a34789

     7 9eca13a34789

     7 f248da0d4c3e tip

     8 f248da0d4c3e tip

     8 merge: warning: conflicts during merge

     9 merge: warning: conflicts during merge

     9 merging file1

    10 merging file1

    10 merging file1 failed!

    11 merging file1 failed!

    19 +=======

    20 +=======

    20  changed file1

    21  changed file1

    21 +>>>>>>>

    22 +>>>>>>>

    22 M file1

    23 M file1

    23 f248da0d4c3e+ tip

    24 f248da0d4c3e+ tip

    24 f248da0d4c3e tip

    26 f248da0d4c3e tip

    25 f248da0d4c3e tip

    27 f248da0d4c3e tip

    26 f248da0d4c3e tip

    28 f248da0d4c3e tip