tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Wed, 19 Jul 2006 07:52:16 -0700
changeset 2639 001703ec311d
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
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 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)