comparison tests/test-stabilize-result.t @ 4077:9c025ec4af88 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 22:09:26 +0200
parents 537fd9a86c06 f9a850018daa
children e6ee830c4f45
comparison
equal deleted inserted replaced
4033:b609412b42b0 4077:9c025ec4af88
129 $ hg commit -m 'add c' 129 $ hg commit -m 'add c'
130 created new head 130 created new head
131 131
132 Get a successors of 8 on it 132 Get a successors of 8 on it
133 133
134 $ hg grab 1cf0aacfd363 134 $ hg pick 1cf0aacfd363
135 grabbing 8:1cf0aacfd363 "newer a" 135 picking 8:1cf0aacfd363 "newer a"
136 136
137 Add real change to the successors 137 Add real change to the successors
138 138
139 $ echo 'babar' >> a 139 $ echo 'babar' >> a
140 $ hg amend 140 $ hg amend