tests/test-merge-revert.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 20 Jul 2006 16:21:07 -0700
changeset 2661 5c10b7ed3411
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
status: add -c (clean) and -A (all files) options also add new localrepo.status what is more uniform than localrepo.changes. localrepo.changes is deprecated and will go away soon.

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