tests/test-merge-revert.out
author Matt Mackall <mpm@selenic.com>
Wed, 10 May 2006 16:55:55 -0500
changeset 2252 ba7afc7dd901
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37

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