equal
deleted
inserted
replaced
160 created new head |
160 created new head |
161 $ fileset 'resolved()' |
161 $ fileset 'resolved()' |
162 $ fileset 'unresolved()' |
162 $ fileset 'unresolved()' |
163 $ hg merge |
163 $ hg merge |
164 merging b2 |
164 merging b2 |
165 warning: conflicts during merge. |
165 warning: conflicts while merging b2! (edit, then use 'hg resolve --mark') |
166 merging b2 incomplete! (edit conflicts, then use 'hg resolve --mark') |
166 6 files updated, 0 files merged, 1 files removed, 1 files unresolved |
167 * files updated, 0 files merged, * files removed, 1 files unresolved (glob) |
|
168 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
167 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
169 [1] |
168 [1] |
170 $ fileset 'resolved()' |
169 $ fileset 'resolved()' |
171 $ fileset 'unresolved()' |
170 $ fileset 'unresolved()' |
172 b2 |
171 b2 |