tests/test-merge-revert.out
author Brendan Cully <brendan@kublai.com>
Wed, 19 Jul 2006 07:52:16 -0700
changeset 2639 001703ec311d
parent 2175 b2ae81a7df29
child 3317 966632304dde
permissions -rw-r--r--
Add an option '-C|--copies' to hg status to show the source of copied files. Copied files are displayed in the form: A newname oldname

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