Mercurial > hg

comparison tests/test-rename-merge1.out @ 3727:0fb66912040a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: report destinations of moves in merge action messages
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Nov 2006 17:36:33 -0600
parents f4dece0f7016
children 723e0ddb6ada
comparison
equal deleted inserted replaced
3726:752884db5037 3727:0fb66912040a
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 partial False 5 overwrite None partial False
6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
7 a: remote moved -> m 7 a: remote moved to b -> m
8 b2: remote created -> g 8 b2: remote created -> g
9 merging a and b 9 merging a and b
10 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c 10 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
11 copying a to b 11 copying a to b
12 removing a 12 removing a