changeset 45853 | b4694ef45db5 |
parent 45827 | 8d72e29ad1e0 |
child 45916 | fa87536d3d70 |
--- a/tests/test-commit-amend.t Tue Nov 17 19:29:08 2020 +0900 +++ b/tests/test-commit-amend.t Mon Nov 16 15:11:51 2020 -0800 @@ -12,7 +12,7 @@ $ hg ci --amend abort: cannot amend public changesets (see 'hg help phases' for details) - [255] + [10] $ hg phase -r . -f -d $ echo a >> a @@ -407,7 +407,7 @@ (branch merge, don't forget to commit) $ hg ci --amend abort: cannot amend while merging - [255] + [20] $ hg ci -m 'merge' Refuse to amend if there is a merge conflict (issue5805):