equal
deleted
inserted
replaced
23 resolving manifests |
23 resolving manifests |
24 overwrite None partial False |
24 overwrite None partial False |
25 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
25 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
26 searching for copies back to rev 1 |
26 searching for copies back to rev 1 |
27 bar: versions differ -> m |
27 bar: versions differ -> m |
|
28 picked tool 'internal:merge' for bar (binary False symlink False) |
28 merging bar |
29 merging bar |
29 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
30 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
|
31 premerge successful |
30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
31 (branch merge, don't forget to commit) |
33 (branch merge, don't forget to commit) |
32 % contents of bar should be line1 line2 |
34 % contents of bar should be line1 line2 |
33 line1 |
35 line1 |
34 line2 |
36 line2 |
69 resolving manifests |
71 resolving manifests |
70 overwrite None partial False |
72 overwrite None partial False |
71 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
73 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
72 searching for copies back to rev 1 |
74 searching for copies back to rev 1 |
73 bar: versions differ -> m |
75 bar: versions differ -> m |
|
76 picked tool 'internal:merge' for bar (binary False symlink False) |
74 merging bar |
77 merging bar |
75 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |
78 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |
|
79 premerge successful |
76 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
77 (branch merge, don't forget to commit) |
81 (branch merge, don't forget to commit) |
78 % contents of bar should be line1 line2 |
82 % contents of bar should be line1 line2 |
79 line1 |
83 line1 |
80 line2 |
84 line2 |