Mercurial > hg

view tests/test-issue619.out @ 9313:8736b1c853ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
notify: do not mime encode multipart templates Mulitpart templates should take care of this themselves. See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html Also catch potential parsing errors gracefully.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 05 Aug 2009 17:19:08 +0200
parents cdc458b12f0f
children 5b48d819d5f9
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: can't merge with ancestor
done