tests/test-stabilize-conflict.t
changeset 2833 08a64770ed24
parent 2709 5d54de9cf50f
child 2834 38db1466c6fb
equal deleted inserted replaced
2832:07b9fcf8b6d3 2833:08a64770ed24
   143   |  summary:     babar count up to ten
   143   |  summary:     babar count up to ten
   144   |
   144   |
   145   | o  changeset:   5:71c18f70c34f
   145   | o  changeset:   5:71c18f70c34f
   146   | |  user:        test
   146   | |  user:        test
   147   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   147   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   148   | |  trouble:     unstable
   148   | |  instability: unstable
   149   | |  summary:     babar count up to fifteen
   149   | |  summary:     babar count up to fifteen
   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
   235   |  summary:     babar count up to ten
   235   |  summary:     babar count up to ten
   236   |
   236   |
   237   | o  changeset:   8:1836b91c6c1d
   237   | o  changeset:   8:1836b91c6c1d
   238   | |  user:        test
   238   | |  user:        test
   239   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   239   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   240   | |  trouble:     unstable
   240   | |  instability: unstable
   241   | |  summary:     babar count up to fifteen
   241   | |  summary:     babar count up to fifteen
   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