Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4861:74f36b1027f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 11 Jul 2007 17:40:41 -0300
parents fffc8a733bf9
children
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