equal
deleted
inserted
replaced
53 a: versions differ -> m |
53 a: versions differ -> m |
54 updating: a 2/2 files (100.00%) |
54 updating: a 2/2 files (100.00%) |
55 picked tool 'true' for a (binary False symlink False) |
55 picked tool 'true' for a (binary False symlink False) |
56 merging a |
56 merging a |
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
58 launching merge tool: true $TESTTMP/r2/a * (glob) |
|
59 merge tool returned: 0 |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
59 $ hg parents |
61 $ hg parents |
60 changeset: 1:1e71731e6fbb |
62 changeset: 1:1e71731e6fbb |
61 tag: tip |
63 tag: tip |
62 user: test |
64 user: test |
74 a: versions differ -> m |
76 a: versions differ -> m |
75 updating: a 2/2 files (100.00%) |
77 updating: a 2/2 files (100.00%) |
76 picked tool 'true' for a (binary False symlink False) |
78 picked tool 'true' for a (binary False symlink False) |
77 merging a |
79 merging a |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
80 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
81 launching merge tool: true $TESTTMP/r2/a * (glob) |
|
82 merge tool returned: 0 |
79 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
83 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
80 $ hg parents |
84 $ hg parents |
81 changeset: 0:c19d34741b0a |
85 changeset: 0:c19d34741b0a |
82 user: test |
86 user: test |
83 date: Thu Jan 01 00:00:00 1970 +0000 |
87 date: Thu Jan 01 00:00:00 1970 +0000 |
103 a: versions differ -> m |
107 a: versions differ -> m |
104 updating: a 2/2 files (100.00%) |
108 updating: a 2/2 files (100.00%) |
105 picked tool 'true' for a (binary False symlink False) |
109 picked tool 'true' for a (binary False symlink False) |
106 merging a |
110 merging a |
107 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
112 launching merge tool: true $TESTTMP/r2/a * (glob) |
|
113 merge tool returned: 0 |
108 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
114 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
109 $ hg parents |
115 $ hg parents |
110 changeset: 1:1e71731e6fbb |
116 changeset: 1:1e71731e6fbb |
111 tag: tip |
117 tag: tip |
112 user: test |
118 user: test |