Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1.out @ 3314:ecc1bf27378c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: unify merge and copy actions
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:41:55 -0500
parents e7abcf3a7c5f
children 966632304dde
comparison
equal deleted inserted replaced
3313:f009a6f12a59 3314:ecc1bf27378c
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
3 merge 3 merge
4 resolving manifests 4 resolving manifests
5 overwrite None branchmerge True partial False 5 overwrite None branchmerge True partial False
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c 6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
7 a: remote moved -> c 7 a: remote moved -> m
8 b2: remote created -> g 8 b2: remote created -> g
9 merging a and b to b 9 merging a and b to b
10 resolving a 10 resolving a
11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c 11 my a@. other b@8e765a822af2 ancestor a@af1939970a1c
12 copying a to b 12 copying a to b