changeset 12195 | ee41be2bbf5a |
parent 12194 | 9e40ea08c2ab |
child 12196 | e42bc7f66e25 |
12194:9e40ea08c2ab | 12195:ee41be2bbf5a |
---|---|
1 adding src/a.c |
|
2 moving src/a.c to source/a.c |
|
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 created new head |
|
5 ? src/a.o |
|
6 merging src/a.c and source/a.c to 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 |