equal
deleted
inserted
replaced
1533 atop:[37] amended |
1533 atop:[37] amended |
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 abort: fix conflicts and see `hg help evolve.interrupted` |
1538 fix conflicts and see `hg help evolve.interrupted` |
1539 [255] |
1539 [1] |
1540 |
1540 |
1541 $ glog -r "be23044af550::" --hidden |
1541 $ glog -r "be23044af550::" --hidden |
1542 @ 38:61abd81de026@default(draft) will be evolved safely |
1542 @ 38:61abd81de026@default(draft) will be evolved safely |
1543 | |
1543 | |
1544 o 37:df89d30f23e2@default(draft) amended |
1544 o 37:df89d30f23e2@default(draft) amended |