changeset 4710 | 0e0731406efd |
parent 4709 | cc3569da7150 |
child 4721 | b69497b23d31 |
--- a/tests/test-touch.t Tue Jul 09 17:02:44 2019 +0800 +++ b/tests/test-touch.t Tue Jul 09 17:08:34 2019 +0800 @@ -186,5 +186,11 @@ working directory is now at * (glob) 1 changesets pruned $ hg touch 16 --hidden - abort: cannot amend merge changesets - [255] + $ hg glog -r '12+15+17' + o 17: merge + |\ + | o 15: ab + | + @ 12: move + | + ~