Mercurial > hg
view tests/test-issue612.out @ 7611:dafcc96c1285
convert: display child command output if --debug (fix 878466138b57)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 08 Jan 2009 14:26:30 +0100 |
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