Mercurial > hg
view tests/test-manifest.out @ 7194:040e325e4f69
merge with crew
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 20 Oct 2008 18:29:44 +0200 |
parents | 7239e06e58e9 |
children |
line wrap: on
line source
% should be empty 3 files updated, 0 files merged, 0 files removed, 0 files unresolved a b/a l 644 a 755 * b/a 644 @ l b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a 047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l a l a b/a l a b/a l % should fail abort: unknown revision '2'! abort: please specify just one revision a b/a l