Mercurial > hg

view tests/test-merge5.out @ 4160:b4bd2f3ea347

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.status: fcmp gets a getnode function instead of the manifest
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 07 Mar 2007 15:25:59 -0300
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes