166 date: Thu Jan 01 00:00:00 1970 +0000 |
166 date: Thu Jan 01 00:00:00 1970 +0000 |
167 summary: a |
167 summary: a |
168 |
168 |
169 % implicit merge with test branch as parent |
169 % implicit merge with test branch as parent |
170 abort: branch 'test' has one head - please merge with an explicit rev |
170 abort: branch 'test' has one head - please merge with an explicit rev |
|
171 (run 'hg heads' to see all heads) |
171 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
172 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
172 % implicit merge with default branch as parent |
173 % implicit merge with default branch as parent |
173 abort: branch 'default' has 3 heads - please merge with an explicit rev |
174 abort: branch 'default' has 3 heads - please merge with an explicit rev |
|
175 (run 'hg heads .' to see heads) |
174 % 3 branch heads, explicit merge required |
176 % 3 branch heads, explicit merge required |
175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 (branch merge, don't forget to commit) |
178 (branch merge, don't forget to commit) |
177 % 2 branch heads, implicit merge works |
179 % 2 branch heads, implicit merge works |
178 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
180 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |