view tests/test-issue619.out @ 6415:69d1946a1d02

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 31 Mar 2008 00:01:27 +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