tests/test-merge-revert.out
author Lee Cantey <lcantey@gmail.com>
Mon, 21 Aug 2006 10:46:58 -0700
changeset 3012 fa4229c60dd7
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Allow for MB/sec transfer rates in test-http-proxy and test-ssh. Also make the test more specific in test-http.

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