Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename-merge1.out @ 3268:6901d3545021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some versions of sed don't support .\+, so use ..* instead. Reported by Christian Ebert for MacOS X.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 05 Oct 2006 20:03:38 +0200
parents c93ce7f10f85
children ae85272b59a4
line wrap: on
line source

checkout
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
merge
resolving manifests
 overwrite None branchmerge True partial False
 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
 a: remote moved -> c
 b2: remote created -> g
resolving a
my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
copying a to b
removing a
getting b2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b
  a
M b2
R a
C c2
blahblah