view tests/test-merge5.out @ 3082:240ec0e61290

Add the -s option to `hg help qseries`.
author john.levon@sun.com
date Wed, 13 Sep 2006 21:46:36 +0200
parents 49988d9f0758
children 41989e55fa37
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