author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Wed, 14 Apr 2010 08:48:26 +0200 | |
branch | stable |
changeset 10901 | 997173e49115 |
parent 6512 | 368a4ec603cc |
permissions | -rw-r--r-- |
adding src/a.c moving src/a.c to source/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head ? src/a.o merging src/a.c and source/a.c to 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