| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Fri, 24 Aug 2007 00:52:28 +0200 | |
| changeset 5217 | 551958d5082c |
| parent 4820 | 9797124581c9 |
| 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