view tests/test-merge5.out @ 4302:d69bdc1091b8

Fixups for recent changes in revlog version handling
author Matt Mackall <mpm@selenic.com>
date Mon, 02 Apr 2007 14:16:44 -0500
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