view tests/test-issue619.out @ 11090:70a0acfe51d6

Merge with stable
author Brendan Cully <brendan@kublai.com>
date Mon, 03 May 2010 15:27:05 -0700
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