tests/test-merge-revert.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:36:04 +0200
changeset 5143 fc6106267198
parent 3407 d2b55e3c4e25
permissions -rw-r--r--
Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

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