Mercurial > hg

view tests/test-merge4.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 b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)