Mercurial > hg

view tests/test-issue619.out @ 11709:3e561b6af810 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: clarify the fact that qimport is trying to read a file "hg qimport tip" would throw "abort: unable to read tip" before this.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sat, 31 Jul 2010 10:50:29 +0900
parents 6f1d1ed3e19a
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: merging with a working directory ancestor has no effect
done