Mercurial > hg

view tests/test-issue612.out @ 5624:3da5ff2a9b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: it is no longer necessary to bundle patch.exe Mercurial can use it's built-in mpatch library
author Steve Borho <steve@borho.org>
date Fri, 07 Dec 2007 18:18:11 -0600
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