Mercurial > hg

comparison tests/test-copy-move-merge.out @ 6512:368a4ec603cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents 5af5f0f9d724
children af5f099d932b
comparison
equal deleted inserted replaced
6511:5c1bb5750558 6512:368a4ec603cc
10 c -> a * 10 c -> a *
11 b -> a * 11 b -> a *
12 checking for directory renames 12 checking for directory renames
13 a: remote moved to c -> m 13 a: remote moved to c -> m
14 a: remote moved to b -> m 14 a: remote moved to b -> m
15 copying a to b 15 preserving a for resolve of b
16 copying a to c 16 preserving a for resolve of c
17 picked tool 'internal:merge' for a (binary False symlink False) 17 removing a
18 merging a and b 18 picked tool 'internal:merge' for b (binary False symlink False)
19 my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 19 merging a and b to b
20 my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
20 premerge successful 21 premerge successful
21 removing a 22 picked tool 'internal:merge' for c (binary False symlink False)
22 picked tool 'internal:merge' for a (binary False symlink False) 23 merging a and c to c
23 merging a and c 24 my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
24 my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
25 premerge successful 25 premerge successful
26 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 26 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
27 (branch merge, don't forget to commit) 27 (branch merge, don't forget to commit)
28 -- b -- 28 -- b --
29 0 29 0