equal
deleted
inserted
replaced
319 t: versions differ -> m (merge) |
319 t: versions differ -> m (merge) |
320 picked tool ':merge' for t (binary False symlink False changedelete False) |
320 picked tool ':merge' for t (binary False symlink False changedelete False) |
321 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
321 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
322 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
322 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
323 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
323 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
324 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
324 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
325 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
325 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
326 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
326 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
327 (branch merge, don't forget to commit) |
327 (branch merge, don't forget to commit) |
328 |
328 |
329 should conflict |
329 should conflict |