tests/test-merge-revert.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 19 Mar 2010 12:45:39 +0100
branchstable
changeset 10736 a528a1046dba
parent 3400 d2b55e3c4e25
child 12156 4c94b6d0fb1c
permissions -rw-r--r--
patch: second line of a context diff starts with '--- ', not '+++ '

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