tests/test-rename-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 27 Sep 2006 20:34:52 +0200
changeset 3169 7492b33bdd9f
parent 3155 c82ea81d6850
child 3257 c93ce7f10f85
permissions -rw-r--r--
shortuser should stop before the first space character. Examples: "Foo Bar <foo.bar AT example DOT com>" -> "foo.bar" (instead of "foo.bar AT example DOT com>" as it was before.) "Foo Bar" -> "Foo"

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
 b: remote created -> g
 b2: remote created -> g
getting b
getting b2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
blahblah
foo