equal
deleted
inserted
replaced
1 created new head |
|
2 changeset: 1:d9da848d0adf |
|
3 user: test |
|
4 date: Mon Jan 12 13:46:40 1970 +0000 |
|
5 summary: cp foo bar; change both |
|
6 |
|
7 searching for copies back to rev 1 |
|
8 unmatched files in other: |
|
9 bar |
|
10 all copies found (* = to merge, ! = divergent): |
|
11 bar -> foo * |
|
12 checking for directory renames |
|
13 resolving manifests |
|
14 overwrite None partial False |
|
15 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf |
|
16 foo: versions differ -> m |
|
17 foo: remote copied to bar -> m |
|
18 preserving foo for resolve of bar |
|
19 preserving foo for resolve of foo |
|
20 updating: foo 1/2 files (50.00%) |
|
21 picked tool 'internal:merge' for bar (binary False symlink False) |
|
22 merging foo and bar to bar |
|
23 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da |
|
24 premerge successful |
|
25 updating: foo 2/2 files (100.00%) |
|
26 picked tool 'internal:merge' for foo (binary False symlink False) |
|
27 merging foo |
|
28 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da |
|
29 premerge successful |
|
30 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
31 (branch merge, don't forget to commit) |
|
32 -- foo -- |
|
33 line 0 |
|
34 line 1 |
|
35 line 2-1 |
|
36 -- bar -- |
|
37 line 0 |
|
38 line 1 |
|
39 line 2-2 |
|