Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-issue619.out @ 5424:005638db9d0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil: fold stat paths together - simplify st/py_st logic - use stp to point to stat buffer - combine stat paths
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Oct 2007 18:47:15 -0500
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