view tests/test-merge5.out @ 4032:c9160748c094

use DESTDIR both places its needed
author Jonathan Smith <https://issues.rpath.com/>
date Mon, 15 Jan 2007 15:49:06 -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