tests/test-merge-revert.out
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Sun, 03 Sep 2006 16:23:18 -0400
changeset 3045 8d344bc72e68
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
[churn] repo.changes was renamed to repo.status

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