Mercurial > hg

view tests/test-issue619.out @ 6351:eed0a6a05096

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: disallow newlines in usernames (issue1034)
author Matt Mackall <mpm@selenic.com>
date Sat, 22 Mar 2008 13:50:59 -0500
parents 8808ea7da86b
children cdc458b12f0f
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