Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue612.out @ 5267:b962f82cfd61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Atom support: replaced xhtml namespace prefix with default namespace
author Robert Bachmann <rbach@rbach.priv.at>
date Thu, 30 Aug 2007 18:55:56 +0200
parents 9797124581c9
children
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