author | Brendan Cully <brendan@kublai.com> |
Thu, 09 Aug 2007 11:37:47 -0700 | |
changeset 5131 | 3edd6fedc33a |
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