tests/test-merge-revert.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 12 Mar 2008 23:21:01 +0100
changeset 6238 aac270593ef7
parent 3400 d2b55e3c4e25
child 12156 4c94b6d0fb1c
permissions -rw-r--r--
convert: rename MAPFILE into REVMAP to disambiguate with filemap

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