view tests/test-merge5.out @ 4175:a2335e832e16

Make update with no node jump to the tip of the current branch
author Brendan Cully <brendan@kublai.com>
date Sat, 10 Mar 2007 17:36:27 -0800
parents fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes