Mercurial > hg

view tests/test-issue612.out @ 5312:fb070713ff36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: more robust for damaged indexes - fix flag reporting - make broken length reporting smarter
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Sep 2007 17:14:39 -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