Mercurial > hg
view tests/test-issue612.out @ 9566:449e85edc8f1
i18n-pt_BR: synchronized with a1ee850f49e3
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Mon, 28 Sep 2009 20:14:39 -0300 |
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