tests/test-stabilize-conflict.t
changeset 1131 a44a26f8cc48
parent 1119 7068ccfed963
child 1167 a1f5a948420d
equal deleted inserted replaced
1130:be31c34bb341 1131:a44a26f8cc48
   141   |  parent:      0:29ec1554cfaf
   141   |  parent:      0:29ec1554cfaf
   142   |  user:        test
   142   |  user:        test
   143   |  date:        Thu Jan 01 00:00:00 1970 +0000
   143   |  date:        Thu Jan 01 00:00:00 1970 +0000
   144   |  summary:     babar count up to ten
   144   |  summary:     babar count up to ten
   145   |
   145   |
   146   | @  changeset:   5:71c18f70c34f
   146   | o  changeset:   5:71c18f70c34f
   147   | |  user:        test
   147   | |  user:        test
   148   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   148   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   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
   231   |  parent:      0:29ec1554cfaf
   231   |  parent:      0:29ec1554cfaf
   232   |  user:        test
   232   |  user:        test
   233   |  date:        Thu Jan 01 00:00:00 1970 +0000
   233   |  date:        Thu Jan 01 00:00:00 1970 +0000
   234   |  summary:     babar count up to ten
   234   |  summary:     babar count up to ten
   235   |
   235   |
   236   | @  changeset:   8:1836b91c6c1d
   236   | o  changeset:   8:1836b91c6c1d
   237   | |  user:        test
   237   | |  user:        test
   238   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   238   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   239   | |  summary:     babar count up to fifteen
   239   | |  summary:     babar count up to fifteen
   240   | |
   240   | |
   241   | x  changeset:   7:e04690b09bc6
   241   | x  changeset:   7:e04690b09bc6