view tests/test-issue619.out @ 9166:e6162b854ed5

changelog: move delayopener outside of class to eliminate reference cycle
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Jul 2009 12:34:38 -0500
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