Mercurial > hg
view tests/test-issue612.out @ 5434:f9c2917a9f7a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 09 Oct 2007 17:25:24 -0500 |
parents | 9797124581c9 |
children | 2493a478f395 |
line wrap: on
line source
adding src/a.c copying src/a.c to source/a.c removing src/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved ? 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