view tests/test-merge5.out @ 5409:190c234c8fa0

hghave: reorder check functions and entries
author Patrick Mezard <pmezard@gmail.com>
date Sun, 07 Oct 2007 18:58:36 +0200
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