Mercurial > evolve
diff tests/test-evolve-abort-phasediv.t @ 6002:cb93b13305c6 mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 12 Aug 2021 22:01:02 +0200 |
parents | 43c4db536990 |
children | 571615c48667 c0921b5277a0 |
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t Thu May 27 23:50:51 2021 +0800 +++ b/tests/test-evolve-abort-phasediv.t Thu Aug 12 22:01:02 2021 +0200 @@ -182,13 +182,13 @@ hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a; hg update c41c793e0ef1; hg revert --all --rev e44ebefe4f54; - hg commit --msg "phase-divergent update to e44ebefe4f54" + hg commit --message "phase-divergent update to e44ebefe4f54" recreate:[9] added c atop:[3] added c hg rebase --rev 28cd06b3f801 --dest b1661037fa25; hg update ca1b80f7960a; hg revert --all --rev 28cd06b3f801; - hg commit --msg "phase-divergent update to 28cd06b3f801" + hg commit --message "phase-divergent update to 28cd06b3f801" $ hg glog --hidden @ 9:28cd06b3f801 added c