Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.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 8808ea7da86b
children
line wrap: on
line source

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done