tests/test-manifest.out
author David Soria Parra <dsp@php.net>
Sun, 07 Dec 2008 08:47:02 +0100
changeset 7485 ecfb683675ed
parent 6737 7239e06e58e9
permissions -rw-r--r--
Merge bookmarks

% 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