Mercurial > hg
view tests/test-issue612.out @ 10712:fbe138da6b38
keyword: 1 variable name for overwriting candidates
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Tue, 16 Mar 2010 22:28:23 +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