Mercurial > hg
view tests/test-issue612.out @ 6410:644a56c7ae79
fix bug introduced by 894875eae49b (short not defined)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 30 Mar 2008 22:22:53 +0200 |
parents | 4b0c9c674707 |
children | 368a4ec603cc |
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 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