Mercurial > hg
view tests/test-issue612.out @ 6523:98dfc5751fdc
test-imerge: disable due to massive brokenness
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 11 Apr 2008 22:17:20 -0700 |
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