tests/test-stabilize-conflict.t
branchmercurial-4.4
changeset 3930 d00f0c369bc7
parent 3714 19ec729f3ca2
parent 3852 629558d09898
child 3936 537fd9a86c06
child 3995 684cc3418ecd
equal deleted inserted replaced
3929:e709e3817d7e 3930:d00f0c369bc7
   138   |  parent:      0:29ec1554cfaf
   138   |  parent:      0:29ec1554cfaf
   139   |  user:        test
   139   |  user:        test
   140   |  date:        Thu Jan 01 00:00:00 1970 +0000
   140   |  date:        Thu Jan 01 00:00:00 1970 +0000
   141   |  summary:     babar count up to ten
   141   |  summary:     babar count up to ten
   142   |
   142   |
   143   | *  changeset:   4:71c18f70c34f
   143   | o  changeset:   4:71c18f70c34f
   144   | |  user:        test
   144   | |  user:        test
   145   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   145   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   146   | |  instability: orphan
   146   | |  instability: orphan
   147   | |  summary:     babar count up to fifteen
   147   | |  summary:     babar count up to fifteen
   148   | |
   148   | |
   230   |  parent:      0:29ec1554cfaf
   230   |  parent:      0:29ec1554cfaf
   231   |  user:        test
   231   |  user:        test
   232   |  date:        Thu Jan 01 00:00:00 1970 +0000
   232   |  date:        Thu Jan 01 00:00:00 1970 +0000
   233   |  summary:     babar count up to ten
   233   |  summary:     babar count up to ten
   234   |
   234   |
   235   | *  changeset:   6:1836b91c6c1d
   235   | o  changeset:   6:1836b91c6c1d
   236   | |  user:        test
   236   | |  user:        test
   237   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   237   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   238   | |  instability: orphan
   238   | |  instability: orphan
   239   | |  summary:     babar count up to fifteen
   239   | |  summary:     babar count up to fifteen
   240   | |
   240   | |