Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1.out @ 3305:e7abcf3a7c5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use contexts rather than my and other
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:27:04 -0500
parents 764688cf51e5
children ecc1bf27378c
comparison
equal deleted inserted replaced
3304:45f0c49f0449 3305:e7abcf3a7c5f
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c 6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
7 a: remote moved -> c 7 a: remote moved -> c
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@f26ec4fc3fa3 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
13 removing a 13 removing a
14 getting b2 14 getting b2
15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 15 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
16 (branch merge, don't forget to commit) 16 (branch merge, don't forget to commit)