equal
deleted
inserted
replaced
366 (/!\ You can try: |
366 (/!\ You can try: |
367 /!\ * manual merge + resolve => new cset X |
367 /!\ * manual merge + resolve => new cset X |
368 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
368 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
369 /!\ * hg revert --all -r X |
369 /!\ * hg revert --all -r X |
370 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
370 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
371 /!\ * hg kill -n Y W Z |
371 /!\ * hg prune -n Y W Z |
372 ) |
372 ) |
373 [255] |
373 [255] |