equal
deleted
inserted
replaced
424 move:[s2] add ggg |
424 move:[s2] add ggg |
425 atop:[s1] add fff |
425 atop:[s1] add fff |
426 move:[s3] add hhh |
426 move:[s3] add hhh |
427 merging hhh |
427 merging hhh |
428 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') |
428 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') |
429 fix conflicts and see `hg help evolve.interrupted` |
429 unresolved merge conflicts |
|
430 (see 'hg help evolve.interrupted') |
430 [1] |
431 [1] |
431 $ echo "resolved hhh" > hhh |
432 $ echo "resolved hhh" > hhh |
432 $ hg resolve --mark hhh |
433 $ hg resolve --mark hhh |
433 (no more unresolved files) |
434 (no more unresolved files) |
434 continue: hg evolve --continue |
435 continue: hg evolve --continue |