tests/test-stabilize-conflict.t
changeset 2896 462adae9fea7
parent 2854 66796d7b5415
child 2929 06844693bb21
equal deleted inserted replaced
2895:e4ee0b6170e9 2896:462adae9fea7
   150   | |
   150   | |
   151   | x  changeset:   4:5977072d13c5
   151   | x  changeset:   4: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:    rewritten as e04690b09bc6
   155   |    obsolete:    amended as 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:   7:e04690b09bc6
   243   | x  changeset:   7: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:    rewritten as b20d08eea373
   247   |    obsolete:    amended as 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