changeset 42621 | 99ebde4fec99 |
parent 39760 | 7e99b02768ef |
child 44344 | ab632e27f296 |
--- a/tests/test-backout.t Sat Jul 13 23:45:32 2019 -0400 +++ b/tests/test-backout.t Tue Jul 02 12:59:58 2019 -0400 @@ -583,12 +583,12 @@ (branch merge, don't forget to commit) $ hg ci -d '4 0' -m 'merge backout of branch1' $ hg id - 22149cdde76d (branch2) tip + d97a8500a969 (branch2) tip $ hg st -A C default C file2 $ hg summary - parent: 4:22149cdde76d tip + parent: 4:d97a8500a969 tip merge backout of branch1 branch: branch2 commit: (clean)