view tests/test-issue619.out @ 10956:a156ce543a5b

bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121) The fix for issue1611 left one last use of "repo" instead of "self" that has resulted in more memory leaks from push/pull operations.
author Isaac Jurado <diptongo@gmail.com>
date Sat, 17 Apr 2010 14:32:26 +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