tests/test-merge-revert.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 30 Jan 2007 19:09:08 -0200
changeset 4058 e7282dede8cd
parent 3407 d2b55e3c4e25
permissions -rw-r--r--
filecommit: don't forget the local parent on a merge with a local rename

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