equal
deleted
inserted
replaced
48 preserving a for resolve of a |
48 preserving a for resolve of a |
49 a: versions differ -> m |
49 a: versions differ -> m |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
50 picked tool 'true' for a (binary False symlink False changedelete False) |
51 merging a |
51 merging a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
53 picked tool 'true' for a (binary False symlink False changedelete False) |
|
54 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
55 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
53 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
56 merge tool returned: 0 |
54 merge tool returned: 0 |
57 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
55 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
58 $ hg parents |
56 $ hg parents |
59 changeset: 1:1e71731e6fbb |
57 changeset: 1:1e71731e6fbb |
73 preserving a for resolve of a |
71 preserving a for resolve of a |
74 a: versions differ -> m |
72 a: versions differ -> m |
75 picked tool 'true' for a (binary False symlink False changedelete False) |
73 picked tool 'true' for a (binary False symlink False changedelete False) |
76 merging a |
74 merging a |
77 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
75 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
78 picked tool 'true' for a (binary False symlink False changedelete False) |
|
79 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
80 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
76 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
81 merge tool returned: 0 |
77 merge tool returned: 0 |
82 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
78 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
83 $ hg parents |
79 $ hg parents |
84 changeset: 0:c19d34741b0a |
80 changeset: 0:c19d34741b0a |
94 getting b |
90 getting b |
95 preserving a for resolve of a |
91 preserving a for resolve of a |
96 a: versions differ -> m |
92 a: versions differ -> m |
97 picked tool 'true' for a (binary False symlink False changedelete False) |
93 picked tool 'true' for a (binary False symlink False changedelete False) |
98 merging a |
94 merging a |
99 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
100 picked tool 'true' for a (binary False symlink False changedelete False) |
|
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
95 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
102 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
96 launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
103 merge tool returned: 0 |
97 merge tool returned: 0 |
104 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
98 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
105 $ hg parents |
99 $ hg parents |