Mercurial > hg

view tests/test-issue612.out @ 5489:3ab405e070bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Honour the exec bit when we go back in time. Fixes issue801.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 05 Nov 2007 18:49:35 -0200
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