tests/test-stabilize-conflict.t
branchstable
changeset 3183 884a3b8aadd6
parent 2709 5d54de9cf50f
child 2798 2280461343e5
child 2833 08a64770ed24
equal deleted inserted replaced
2722:44a6e6fbf80b 3183:884a3b8aadd6
   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   |    summary:     babar count up to ten
   156   |    summary:     babar count up to ten
   156   |
   157   |
   157   o  changeset:   0:29ec1554cfaf
   158   o  changeset:   0:29ec1554cfaf
   158      user:        test
   159      user:        test
   159      date:        Thu Jan 01 00:00:00 1970 +0000
   160      date:        Thu Jan 01 00:00:00 1970 +0000
   241   | |
   242   | |
   242   | x  changeset:   7:e04690b09bc6
   243   | x  changeset:   7:e04690b09bc6
   243   |/   parent:      0:29ec1554cfaf
   244   |/   parent:      0:29ec1554cfaf
   244   |    user:        test
   245   |    user:        test
   245   |    date:        Thu Jan 01 00:00:00 1970 +0000
   246   |    date:        Thu Jan 01 00:00:00 1970 +0000
       
   247   |    obsolete:    rewritten as b20d08eea373
   246   |    summary:     babar count up to ten
   248   |    summary:     babar count up to ten
   247   |
   249   |
   248   o  changeset:   0:29ec1554cfaf
   250   o  changeset:   0:29ec1554cfaf
   249      user:        test
   251      user:        test
   250      date:        Thu Jan 01 00:00:00 1970 +0000
   252      date:        Thu Jan 01 00:00:00 1970 +0000