300 picked tool ':merge' for t (binary False symlink False) |
300 picked tool ':merge' for t (binary False symlink False) |
301 merging t |
301 merging t |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
302 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
303 picked tool ':merge' for t (binary False symlink False) |
303 picked tool ':merge' for t (binary False symlink False) |
304 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
304 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
305 warning: conflicts during merge. |
305 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
306 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
307 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
306 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
308 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
307 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
309 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
308 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
310 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
309 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
311 (branch merge, don't forget to commit) |
310 (branch merge, don't forget to commit) |