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