view tests/test-merge5.out @ 4350:3380eb6d7c32

fix 'hg <not-log> -v --template foo' with revisions without copies
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 13:00:23 -0300
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