comparison tests/test-stabilize-result.t @ 1631:7463f5880ce9

prune: remove the kill alias This have been a long time since the command was rename (over 'kill -1' threat), it is time to get rid of it.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 18 Mar 2016 16:37:49 -0700
parents c4f8a2916e43
children dd6f090b7342 8f902ec9ed9a
comparison
equal deleted inserted replaced
1630:35c666ef724e 1631:7463f5880ce9
364 (/!\ You can try: 364 (/!\ You can try:
365 /!\ * manual merge + resolve => new cset X 365 /!\ * manual merge + resolve => new cset X
366 /!\ * hg up to the parent of the amended changeset (which are named W and Z) 366 /!\ * hg up to the parent of the amended changeset (which are named W and Z)
367 /!\ * hg revert --all -r X 367 /!\ * hg revert --all -r X
368 /!\ * hg ci -m "same message as the amended changeset" => new cset Y 368 /!\ * hg ci -m "same message as the amended changeset" => new cset Y
369 /!\ * hg kill -n Y W Z 369 /!\ * hg prune -n Y W Z
370 ) 370 )
371 [255] 371 [255]