tests/test-merge-revert.out
author Matt Mackall <mpm@selenic.com>
Mon, 24 Jul 2006 17:13:58 -0500
changeset 2659 93b765f30c07
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

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