diff -r f4776f8b98e0 -r 920f69c0b549 tests/test-shelve.t --- a/tests/test-shelve.t Tue May 29 00:13:48 2018 +0200 +++ b/tests/test-shelve.t Tue May 29 00:12:35 2018 +0200 @@ -1277,7 +1277,7 @@ unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate - $ mv ../corrupt-shelvedstate .hg/histedit-state + $ mv ../corrupt-shelvedstate .hg/shelvestate $ hg unshelve --abort 2>&1 | grep 'aborted' unshelve of 'default-01' aborted $ hg summary