changeset 25695 | ce3d4b858420 |
parent 25125 | bd625cd4e5e7 |
parent 25677 | af5b2f4ed594 |
child 26614 | ef1eb6df7071 |
--- a/tests/test-rebase-conflicts.t Tue Jun 30 22:39:28 2015 -0700 +++ b/tests/test-rebase-conflicts.t Wed Jul 01 16:33:31 2015 -0500 @@ -272,9 +272,8 @@ removing f1.txt f2.txt: remote created -> g getting f2.txt - 3 changesets found + 2 changesets found list of changesets: - 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c e31216eec445e44352c5f01588856059466a24c9 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)