| author | Matt Mackall <mpm@selenic.com> |
| Fri, 01 Oct 2010 10:18:53 -0500 | |
| branch | stable |
| changeset 12610 | 80345db2b6a3 |
| 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