Mercurial > hg-stable

view tests/test-issue612.out @ 6019:b70a530bdb93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanly abort on unknown archive type (issue966)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Tue, 05 Feb 2008 15:54:42 +0100
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