Mercurial > hg
view tests/test-issue612.out @ 7925:c84df11bf721
i18n: updated zh_CN instructions
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Tue, 31 Mar 2009 20:40:56 +0200 |
parents | 368a4ec603cc |
children |
line wrap: on
line source
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