1 adding src/a.c

     2 copying src/a.c to source/a.c

     3 removing src/a.c

     4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved

     5 ? src/a.o

     6 merging src/a.c and source/a.c

     7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved

     8 (branch merge, don't forget to commit)

     9 M source/a.c

    10 R src/a.c

    11 ? source/a.o