tests/test-rename-merge1.out
author Matt Mackall <mpm@selenic.com>
Mon, 02 Oct 2006 12:04:48 -0500
changeset 3233 3fd098e0902d
parent 3155 c82ea81d6850
child 3257 c93ce7f10f85
permissions -rw-r--r--
merge: extend file merge function for renames

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