tests/test-merge-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 11 Oct 2006 16:41:52 +0200
changeset 3331 f472cf9a71af
parent 3311 966632304dde
child 3400 d2b55e3c4e25
permissions -rw-r--r--
merge with crew

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip