tests/test-merge-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 24 Aug 2007 00:52:28 +0200
changeset 5217 551958d5082c
parent 3407 d2b55e3c4e25
permissions -rw-r--r--
testcase for issue705 (fixed by 316ce5e85b3e)

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
1 files updated, 0 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