view tests/test-merge5.out @ 3521:467d923e4e3d

Fix excessive complaining from hg log -b
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Oct 2006 17:45:35 -0500
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