view tests/test-merge5.out @ 4654:e0e73ba37983

Fix dispatch error message when not in a repo
author Brendan Cully <brendan@kublai.com>
date Wed, 20 Jun 2007 20:13:31 -0700
parents fffc8a733bf9
children 4b0c9c674707
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