| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
| Wed, 11 Jul 2007 19:56:16 -0300 | |
| changeset 4836 | 0e2d0a78f81a |
| parent 4819 | 9797124581c9 |
| child 5610 | 2493a478f395 |
| permissions | -rw-r--r-- |
adding src/a.c copying src/a.c to source/a.c removing src/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved ? src/a.o merging src/a.c and source/a.c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M source/a.c R src/a.c ? source/a.o