tests/test-rebase-conflicts.t
changeset 25695 ce3d4b858420
parent 25125 bd625cd4e5e7
parent 25677 af5b2f4ed594
child 26614 ef1eb6df7071
equal deleted inserted replaced
25694:5ede49f4383a 25695:ce3d4b858420
   270    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   270    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   271    f1.txt: other deleted -> r
   271    f1.txt: other deleted -> r
   272   removing f1.txt
   272   removing f1.txt
   273    f2.txt: remote created -> g
   273    f2.txt: remote created -> g
   274   getting f2.txt
   274   getting f2.txt
   275   3 changesets found
   275   2 changesets found
   276   list of changesets:
   276   list of changesets:
   277   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
       
   278   e31216eec445e44352c5f01588856059466a24c9
   277   e31216eec445e44352c5f01588856059466a24c9
   279   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   278   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   280   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
   279   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
   281   3 changesets found
   280   3 changesets found
   282   list of changesets:
   281   list of changesets: