view tests/test-issue619.out @ 8725:353b1c160c2d

bookmarks: update docstring
author Abderrahim Kitouni <a.kitouni@gmail.com>
date Thu, 04 Jun 2009 21:24:29 +0100
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