equal
deleted
inserted
replaced
1534 move:[36] will cause conflict at evolve |
1534 move:[36] will cause conflict at evolve |
1535 atop:[38] will be evolved safely |
1535 atop:[38] will be evolved safely |
1536 merging newfile |
1536 merging newfile |
1537 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
1537 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
1538 evolve failed! |
1538 evolve failed! |
1539 see `hg help evolve.interrupted-evolve` |
1539 see `hg help evolve.interrupted` |
1540 abort: unresolved merge conflicts (see hg help resolve) |
1540 abort: unresolved merge conflicts (see hg help resolve) |
1541 [255] |
1541 [255] |
1542 |
1542 |
1543 $ glog -r "be23044af550::" --hidden |
1543 $ glog -r "be23044af550::" --hidden |
1544 @ 38:61abd81de026@default(draft) will be evolved safely |
1544 @ 38:61abd81de026@default(draft) will be evolved safely |