comparison tests/test-stabilize-result.t @ 4076:f9a850018daa mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 22:06:12 +0200
parents d00f0c369bc7 eb4d07a0b19f
children 9c025ec4af88 55ca0b6276e7
comparison
equal deleted inserted replaced
4032:fc065ec30351 4076:f9a850018daa
126 $ hg commit -m 'add c' 126 $ hg commit -m 'add c'
127 created new head 127 created new head
128 128
129 Get a successors of 8 on it 129 Get a successors of 8 on it
130 130
131 $ hg grab 1cf0aacfd363 131 $ hg pick 1cf0aacfd363
132 grabbing 6:1cf0aacfd363 "newer a" 132 picking 6:1cf0aacfd363 "newer a"
133 133
134 Add real change to the successors 134 Add real change to the successors
135 135
136 $ echo 'babar' >> a 136 $ echo 'babar' >> a
137 $ hg amend 137 $ hg amend