comparison tests/test-evolve-interrupted.t @ 6396:e5bd76f95145 mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 21:38:31 +0400
parents 7e6765cf6e5d 1cf185dd551a
children 270223576b7f 43a2a333e343
comparison
equal deleted inserted replaced
6350:0aff320554d2 6396:e5bd76f95145
133 rollback completed 133 rollback completed
134 abort: precommit hook exited with status 1 134 abort: precommit hook exited with status 1
135 [255] 135 [255]
136 $ hg evolve --continue 136 $ hg evolve --continue
137 evolving 1:e0486f65907d "banana" 137 evolving 1:e0486f65907d "banana"
138 working directory is now at bd5ec7dfc2af 138 working directory is now at b10ea0f329d2
139 $ cat .hg/evolvestate 139 $ cat .hg/evolvestate
140 cat: .hg/evolvestate: No such file or directory 140 cat: .hg/evolvestate: No such file or directory
141 [1] 141 [1]
142 $ cat b 142 $ cat b
143 banana 143 banana