tests/test-stabilize-conflict.t
branchstable
changeset 3115 663dbef40f97
parent 3083 e91ca8b5ecf7
child 3116 9f900937c198
child 3359 ae6fddf39933
equal deleted inserted replaced
3114:9db99aee4b87 3115:663dbef40f97
   150   | |
   150   | |
   151   | x  changeset:   3:5977072d13c5
   151   | x  changeset:   3:5977072d13c5
   152   |/   parent:      0:29ec1554cfaf
   152   |/   parent:      0:29ec1554cfaf
   153   |    user:        test
   153   |    user:        test
   154   |    date:        Thu Jan 01 00:00:00 1970 +0000
   154   |    date:        Thu Jan 01 00:00:00 1970 +0000
   155   |    obsolete:    amended as 5:e04690b09bc6
   155   |    obsolete:    amended using amend as 5:e04690b09bc6
   156   |    summary:     babar count up to ten
   156   |    summary:     babar count up to ten
   157   |
   157   |
   158   o  changeset:   0:29ec1554cfaf
   158   o  changeset:   0:29ec1554cfaf
   159      user:        test
   159      user:        test
   160      date:        Thu Jan 01 00:00:00 1970 +0000
   160      date:        Thu Jan 01 00:00:00 1970 +0000
   242   | |
   242   | |
   243   | x  changeset:   5:e04690b09bc6
   243   | x  changeset:   5:e04690b09bc6
   244   |/   parent:      0:29ec1554cfaf
   244   |/   parent:      0:29ec1554cfaf
   245   |    user:        test
   245   |    user:        test
   246   |    date:        Thu Jan 01 00:00:00 1970 +0000
   246   |    date:        Thu Jan 01 00:00:00 1970 +0000
   247   |    obsolete:    amended as 7:b20d08eea373
   247   |    obsolete:    amended using amend as 7:b20d08eea373
   248   |    summary:     babar count up to ten
   248   |    summary:     babar count up to ten
   249   |
   249   |
   250   o  changeset:   0:29ec1554cfaf
   250   o  changeset:   0:29ec1554cfaf
   251      user:        test
   251      user:        test
   252      date:        Thu Jan 01 00:00:00 1970 +0000
   252      date:        Thu Jan 01 00:00:00 1970 +0000